From cb2adddafe68560d8db49422294d56f9de1fa55e Mon Sep 17 00:00:00 2001
From: ProxySU <proxysetuptools@gmail.com>
Date: Mon, 9 Mar 2020 16:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BD=BF=E7=94=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProxySU/MainWindow.xaml    | 17 +++++++++--------
 ProxySU/MainWindow.xaml.cs | 34 +++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
index a56f23b..3bd96b8 100644
--- a/ProxySU/MainWindow.xaml
+++ b/ProxySU/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ProxySU"
         mc:Ignorable="d"
-        Title="ProxySU" Height="450" Width="600">
+        Title="ProxySU" Height="550" Width="600">
     <Grid>
         <Grid>
             <Grid.ColumnDefinitions>
@@ -22,9 +22,9 @@
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="30"></RowDefinition>
-                <RowDefinition Height="30"></RowDefinition>
-                <RowDefinition Height="30"></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition Height="60"></RowDefinition>
+                <RowDefinition ></RowDefinition>
+                <RowDefinition Height="60"></RowDefinition>
             </Grid.RowDefinitions>
             <TextBlock Text="主机名" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5" Grid.Column="0" Grid.Row="0"></TextBlock>
             <TextBlock Text="端口" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5" Grid.Column="2" Grid.Row="0"></TextBlock>
@@ -55,13 +55,14 @@
             <TextBox x:Name="TextBoxProxyUserName" IsEnabled="False" Text="" Margin="5" Grid.Column="1" Grid.Row="6"></TextBox>
             <PasswordBox x:Name="PasswordBoxProxyPassword" IsEnabled="False" Password=""  Margin="5" Grid.Column="3" Grid.Row="6"></PasswordBox>
 
-            <TextBlock x:Name="TextBlockSetUpProcessing" Text="等待安装布署" Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="3"></TextBlock>
-            <ProgressBar x:Name="ProgressBarSetUpProcessing" Minimum="0" Maximum="100" Value="0" IsIndeterminate="False" Margin="7" Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="4"></ProgressBar>
+            <StatusBar x:Name="StatusBarStatusMonitoring" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="4"></StatusBar>
+            <!--<TextBlock x:Name="TextBlockSetUpProcessing" Text="等待安装布署" Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="3"></TextBlock>
+            <ProgressBar x:Name="ProgressBarSetUpProcessing" Minimum="0" Maximum="100" Value="0" IsIndeterminate="False" Margin="7" Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="4"></ProgressBar>-->
             <!--<TextBlock Text="代理类型:" Grid.Column="2" Grid.Row="3"></TextBlock>
             <ComboBox x:Name="proxyType"  Grid.Column="3" Grid.Row="3" Margin="5"></ComboBox>-->
 
-            <Button x:Name="Button_Login" Content="布署安装" Grid.ColumnSpan="2" Margin="20" Grid.Column="0" Grid.Row="9" Click="Button_Login_Click"></Button>
-            <Button x:Name="Button_canel" Content="取消" Grid.ColumnSpan="2" Margin="20" Grid.Column="2" Grid.Row="9" Click="Button_canel_Click"></Button>
+            <Button x:Name="Button_Login" Content="布署安装" Grid.ColumnSpan="2" Margin="10" Grid.Column="0" Grid.Row="9" Click="Button_Login_Click"></Button>
+            <Button x:Name="Button_canel" Content="取消" Grid.ColumnSpan="2" Margin="10" Grid.Column="2" Grid.Row="9" Click="Button_canel_Click"></Button>
         </Grid>
     </Grid>
 </Window>
diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
index 8ec458d..1a5583a 100644
--- a/ProxySU/MainWindow.xaml.cs
+++ b/ProxySU/MainWindow.xaml.cs
@@ -96,8 +96,8 @@ namespace ProxySU
             string sshProxyUser = TextBoxProxyUserName.Text.ToString();
             string sshProxyPassword = PasswordBoxProxyPassword.Password.ToString();
 
-            TextBlockSetUpProcessing.Text = "登录中";
-            ProgressBarSetUpProcessing.IsIndeterminate = true;
+            //TextBlockSetUpProcessing.Text = "登录中";
+            //ProgressBarSetUpProcessing.IsIndeterminate = true;
 
            
             try
@@ -161,18 +161,18 @@ namespace ProxySU
                     #endregion
                  
                     client.Connect();
-                    if (client.IsConnected == true)
-                    {
-                        TextBlockSetUpProcessing.Text = "主机已登录";
-                        ProgressBarSetUpProcessing.IsIndeterminate = false;
-                        ProgressBarSetUpProcessing.Value = 100;
-                    }
-                    else
-                    {
-                        TextBlockSetUpProcessing.Text = "主机登录失败";
-                        ProgressBarSetUpProcessing.IsIndeterminate = false;
-                        ProgressBarSetUpProcessing.Value = 0;
-                    }
+                    //if (client.IsConnected == true)
+                    //{
+                    //    TextBlockSetUpProcessing.Text = "主机已登录";
+                    //    ProgressBarSetUpProcessing.IsIndeterminate = false;
+                    //    ProgressBarSetUpProcessing.Value = 100;
+                    //}
+                    //else
+                    //{
+                    //    TextBlockSetUpProcessing.Text = "主机登录失败";
+                    //    ProgressBarSetUpProcessing.IsIndeterminate = false;
+                    //    ProgressBarSetUpProcessing.Value = 0;
+                    //}
                     client.RunCommand("echo 1111 >> test.json");
                     MessageBox.Show(client.ConnectionInfo.ServerVersion.ToString());
                     //MessageBox.Show(client);
@@ -209,9 +209,9 @@ namespace ProxySU
                 {
                     MessageBox.Show("未知错误");
                 }
-                TextBlockSetUpProcessing.Text = "主机登录失败";
-                ProgressBarSetUpProcessing.IsIndeterminate = false;
-                ProgressBarSetUpProcessing.Value = 0;
+                //TextBlockSetUpProcessing.Text = "主机登录失败";
+                //ProgressBarSetUpProcessing.IsIndeterminate = false;
+                //ProgressBarSetUpProcessing.Value = 0;
             }
         }