From 8220e07fe68e3632d28b37907357fc9a7bd923c6 Mon Sep 17 00:00:00 2001
From: xiang <xiangbing@88.com>
Date: Sun, 27 Oct 2024 22:27:53 +0800
Subject: [PATCH] update

---
 Video.xaml    | 35 +++++++++++++++++++++++++----------
 Video.xaml.cs | 29 ++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/Video.xaml b/Video.xaml
index 7536aa6..601de7f 100644
--- a/Video.xaml
+++ b/Video.xaml
@@ -7,16 +7,31 @@
         xmlns:local="clr-namespace:VideoConcat"
         xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
         mc:Ignorable="d"
-        Title="视频" Height="450" Width="800" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" >
+        Title="视频"  WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Width="710" Height="400">
     <Grid>
-        <StackPanel Margin="10" >
-            <StackPanel Height="30" Margin="2"  Orientation="Horizontal" HorizontalAlignment="Left" >
-                <Label Content="生成视频的个数:" VerticalContentAlignment="Center" Width="auto" BorderBrush="#0000EE" BorderThickness="1"></Label>
-                <TextBox  Width="580"  AutomationProperties.HelpText="输入要生成的视频个数" Margin="10,0,10,0" InputScope="Number"></TextBox>
-                <Button Content="开始拼接"   Click="Button_Click" x:Name="startButton"   Width="auto"/>
-            </StackPanel>
-            <TextBox  Margin="2" TextWrapping="Wrap" Text="" Height="auto" x:Name="outputTxt"/>
-        </StackPanel>
-        <ProgressBar x:Name="processVideoBar" Minimum="0" Maximum="100" Value="0" VerticalAlignment="Bottom" Height="10" Margin="5"/>
+        <Viewbox Margin="5">
+            <Grid>
+
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="120"></ColumnDefinition>
+                    <ColumnDefinition Width="500"></ColumnDefinition>
+                    <ColumnDefinition Width="80"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition  Height="30"></RowDefinition>
+                    <RowDefinition Height="300"></RowDefinition>
+                    <RowDefinition Height="10"></RowDefinition>
+                </Grid.RowDefinitions>
+
+                <Label  Content="生成视频的个数:" VerticalContentAlignment="Center" BorderThickness="1" Padding="5,0,5,0"></Label>
+                <TextBox Grid.Column="1" wd:TextBoxHelper.AllowOnlyNumericInput="True"  wd:TextBoxHelper.MinValue="1"  ></TextBox>
+                <Button Grid.Column="2" Content="开始拼接"   Click="Button_Click" x:Name="startButton"  />
+                <ScrollViewer Grid.Row="1" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Auto" x:Name="scrowText" Margin="0,10,0,0">
+                    <TextBlock  Text=""  x:Name="outputTxt" OverridesDefaultStyle="True"  TextWrapping="Wrap"/>
+                </ScrollViewer>
+                <ProgressBar Grid.Row="2"  Grid.ColumnSpan="3" x:Name="processVideoBar" Minimum="0" Maximum="100" Value="0" Margin="0,0,0,0"  />
+            </Grid>
+        </Viewbox>
     </Grid>
 </Window>
diff --git a/Video.xaml.cs b/Video.xaml.cs
index f31456d..a266562 100644
--- a/Video.xaml.cs
+++ b/Video.xaml.cs
@@ -27,7 +27,34 @@ namespace VideoConcat
         private async void Button_Click(object sender, RoutedEventArgs e)
         {
             startButton.IsEnabled = false;
-            await Task.Run(() => ProcessVideo.RunTask(processVideoBar, startButton));
+            await Task.Run(() =>
+            {
+                string text = "";
+                for (int i = 0; i <= 100; i++)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        processVideoBar.Dispatcher.Invoke(() =>
+                        {
+                            processVideoBar.Value = i;
+                           
+                        });
+                        outputTxt.Dispatcher.Invoke(new Action(() =>
+                        {
+                            text += "正在生成第" + i + "个视频\r\n";
+                            outputTxt.Text = text;
+                            scrowText.ScrollToEnd();
+                        }));
+                    });
+                    System.Threading.Thread.Sleep(50);
+                }
+
+                startButton.Dispatcher.Invoke(() =>
+                {
+                    startButton.IsEnabled = true;
+                });
+
+            });//ProcessVideo.RunTask(processVideoBar, startButton)
         }
     }
 }