From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点

---
 WPFProject/LoadingWindow.xaml |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/WPFProject/LoadingWindow.xaml b/WPFProject/LoadingWindow.xaml
index bd89dd2..82b01c5 100644
--- a/WPFProject/LoadingWindow.xaml
+++ b/WPFProject/LoadingWindow.xaml
@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:WPFProject"
         xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
         xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
+        xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
         mc:Ignorable="d"
         Height="420"
         Width="600"
@@ -15,16 +16,111 @@
         ContentRendered="WindowX_ContentRendered"
             WindowStartupLocation="CenterScreen"
         Loaded="Window_Loaded">
+    <Window.Resources>
+        <!--<Style x:Key="CarouselStyle"
+        TargetType="pu:Carousel">
+            <Setter Property="Animation"
+             Value="Flow,Fade" />
+            <Setter Property="AnimationEasing"
+             Value="CubicOut" />
+            <Setter Property="IndicatorVisibility"
+             Value="Visible" />
+            <Setter Property="IndicatorPaginationStyle">
+                <Setter.Value>
+                    <Style TargetType="pu:Pagination"
+                    BasedOn="{StaticResource {x:Static pu:Carousel.IndicatorPaginationStyleKey}}">
+                        <Setter Property="ItemsWidth"
+                         Value="NaN" />
+                        <Setter Property="ItemsHeight"
+                         Value="NaN" />
+                        <Setter Property="ItemsBackground"
+                         Value="Transparent" />
+                        <Setter Property="ItemsForeground"
+                         Value="#55000000" />
+                        <Setter Property="ItemsSelectedBackground"
+                         Value="{x:Null}" />
+                        <Setter Property="ItemsSelectedForeground"
+                         Value="#C62F2F" />
+                        <Setter Property="ItemContainerStyle">
+                            <Setter.Value>
+                                <Style TargetType="pu:PaginationItem">
+                                    <Setter Property="Cursor"
+                                     Value="Hand" />
+                                    <Setter Property="ContentTemplate">
+                                        <Setter.Value>
+                                            <DataTemplate>
+                                                <TextBlock Text="&#xe954;"
+                                                    FontFamily="{StaticResource PanuonIconFont}"
+                                                    FontSize="16" />
+                                            </DataTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+        </Style>-->
+    </Window.Resources>
+    
     <Grid Margin="10">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <!--TextBox x:Name="Console" IsReadOnly="True" Text="{Binding ConsoleText}"/>-->
-        <RichTextBox x:Name="Console" IsReadOnly="True" Padding="0" VerticalScrollBarVisibility="Auto"
+        <Image Height="25"
+       Stretch="Uniform" x:Name="logo"
+   HorizontalAlignment="Left" Margin="0,0,0,10"
+   RenderOptions.BitmapScalingMode="HighQuality" />
+
+        <!--<pu:Carousel
+             AutoPlayDuration="0:0:2"
+             Height="300"
+             TextBlock.FontSize="40"
+             TextBlock.TextAlignment="Center">
+            <Border Background="#FAFAFA">
+                <TextBlock Text="Page 1"
+                   VerticalAlignment="Center" />
+            </Border>
+            <Border Background="#FAFAFA">
+                <TextBlock Text="Page 2"
+                   VerticalAlignment="Center" />
+            </Border>
+            <Border Background="#FAFAFA">
+                <TextBlock Text="Page 3"
+                   VerticalAlignment="Center" />
+            </Border>
+            <Border Background="#FAFAFA">
+                <TextBlock Text="Page 4"
+                   VerticalAlignment="Center" />
+            </Border>
+            <Border Background="#FAFAFA">
+                <TextBlock Text="Page 5"
+                   VerticalAlignment="Center" />
+            </Border>
+        </pu:Carousel>-->
+
+        <ProgressBar Grid.Row="1" x:Name="processBar" Minimum="0" Maximum="100" Height="20" Margin="0,0,0,10"
+                     Visibility="Visible"/>
+
+        <RichTextBox Grid.Row="2" x:Name="Console" IsReadOnly="True" Padding="0" VerticalScrollBarVisibility="Auto"
                      VerticalContentAlignment="Top"
-                     HorizontalContentAlignment="Left"
-                     />
-        <Button Grid.Row="1" Style="{StaticResource PrimaryButton}" Content="涓嬩竴姝�" Click="Button_Click"/>
+                     Margin="0,0,0,10"
+                     Visibility="Visible"
+                     HorizontalContentAlignment="Left">
+            <RichTextBox.Resources>
+                <Style TargetType="ScrollBar" BasedOn="{StaticResource ScrollStyle_Mobile}"/>
+            </RichTextBox.Resources>
+        </RichTextBox>
+        <Button Grid.Row="3" Style="{StaticResource PrimaryButton}" 
+                x:Name="BtnNext" Visibility="Collapsed"
+                Content="{DynamicResource App.Continue}" Click="Button_Click"/>
     </Grid>
 </pu:WindowX>

--
Gitblit v1.9.1