From 2cc8134d466a6e7d8f7f0aea2c7464af476f810d Mon Sep 17 00:00:00 2001
From: ProxySU <proxysetuptools@gmail.com>
Date: Tue, 10 Mar 2020 07:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BD=BF=E7=94=A8=E5=A4=9A?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProxySU/MainWindow.xaml    | 17 +++++++++--------
 ProxySU/MainWindow.xaml.cs | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
index 3bd96b8..53e8e31 100644
--- a/ProxySU/MainWindow.xaml
+++ b/ProxySU/MainWindow.xaml
@@ -22,7 +22,9 @@
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="30"></RowDefinition>
-                <RowDefinition Height="60"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30" ></RowDefinition>
+                <RowDefinition ></RowDefinition>
                 <RowDefinition ></RowDefinition>
                 <RowDefinition Height="60"></RowDefinition>
             </Grid.RowDefinitions>
@@ -55,14 +57,13 @@
             <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>
 
-            <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>-->
+            <!--<StatusBar x:Name="StatusBarStatusMonitoring" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="4"></StatusBar>-->
+            <TextBlock x:Name="TextBlockSetUpProcessing" Text="等待安装布署" Foreground="Blue" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="4"></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>
 
-            <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>
+
+            <Button x:Name="Button_Login" Content="布署安装" Grid.ColumnSpan="2" Margin="10" Grid.Column="0" Grid.Row="11" Click="Button_Login_Click"></Button>
+            <Button x:Name="Button_canel" Content="取消" Grid.ColumnSpan="2" Margin="10" Grid.Column="2" Grid.Row="11" Click="Button_canel_Click"></Button>
         </Grid>
     </Grid>
 </Window>
diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
index 1a5583a..bcb754c 100644
--- a/ProxySU/MainWindow.xaml.cs
+++ b/ProxySU/MainWindow.xaml.cs
@@ -13,6 +13,8 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Renci.SshNet;
 using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace ProxySU
 {
@@ -315,5 +317,22 @@ namespace ProxySU
             PasswordBoxProxyPassword.IsEnabled = true;
         }
         #endregion
+        private void Begin(TextBlock textBlock)
+        {
+            //int i = 100000000;
+            //while (i > 0)
+            //{
+            //    i--;
+            //}
+            //Random random = new Random();
+            //String Num = random.Next(0, 100).ToString();
+            Action<TextBlock, String> updateAction = new Action<TextBlock, string>(UpdateTextBlockSetUpProcessing);
+            TextBlockSetUpProcessing.Dispatcher.BeginInvoke(updateAction, textBlock, Num);
+        }
+        //更新UI代码
+        private void UpdateTextBlockSetUpProcessing(TextBlock textBlock, string text)
+        {
+            textBlock.Text = text;
+        }
     }
 }