ui优化

XHWK.WKTool/App.cs

@@ -131,12 +131,14 @@ namespace XHWK.WKTool
         /// 提示窗口
         /// </summary>
         public static PromptWindow W_PromptWindow = null;
+        public static LoadDialog myloading;
         #endregion
         #endregion
 
         [STAThread]
         private static void Main()
         {
+            myloading = new LoadDialog();
             StopSameProcess();
             Killffmpeg();
             LatticeFileHelper.RunPrintConfig();

XHWK.WKTool/FileDirectoryWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="FileDirectoryWindow" Height="729" Width="1030" AllowsTransparency="True" 
     ShowInTaskbar="False" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" MouseLeftButtonUp="Window_MouseLeftButtonUp"
-    WindowStartupLocation="CenterOwner"
+    WindowStartupLocation="CenterOwner" 
     WindowStyle="None">
     <Window.Resources>
         <!--  ListBox容器样式  -->
@@ -31,7 +31,7 @@
         </Style>
         <DataTemplate x:Key="TongjiItem">
             <UniformGrid
-                Height="36"
+                Height="50"
                 Margin="0,0,0,0"
                 Background="{Binding Colour}"
                 Columns="5"
@@ -40,7 +40,7 @@
                 <TextBlock 
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="{Binding SerialNumber}" />
                 <Grid>
                     <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
@@ -48,14 +48,14 @@
                         <TextBox IsEnabled="{Binding IsEnabled}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
-                    Text="{Binding VideoName,Mode=TwoWay}" />
+                    FontSize="16" Height="30" Padding="0,5,0,0"
+                    Text="{Binding VideoName,Mode=TwoWay}" Width="150"/>
                         <Button x:Name="btnModify" Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnModify_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
                             </Grid>
                         </Button>
                     </StackPanel>
@@ -73,13 +73,13 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="{Binding VideoSize}" />
                 <!--最短时长-->
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="{Binding VideoTime}" />
 
                 <Grid>
@@ -89,24 +89,24 @@
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnPlay_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory1.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory2.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory1.png" Margin="10" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory2.png" Margin="10" Visibility="{Binding cos}"/>
                             </Grid>
                         </Button>
                         <Button x:Name="btnUpload" Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnUpload_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory7.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory8.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory7.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory8.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
                             </Grid>
                         </Button>
                         <Button x:Name="btnDelete" Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnDelete_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
                             </Grid>
                         </Button>
                     </StackPanel>
@@ -117,64 +117,81 @@
         </DataTemplate>
     </Window.Resources>
     <Viewbox>
-        <Grid Height="729" Width="1030" >
-            <!--分4行-->
-            <Grid.RowDefinitions>
-                <RowDefinition Height="45"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="30"/>
-            </Grid.RowDefinitions>
-            <!--第一行 标题-->
-            <Border Grid.Row="0" Background="#2D8CF0">
-                <Grid  MouseLeftButtonDown="Window_MouseLeftButtonDown">
-                    <TextBlock Text="文件目录" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnDown_Click"/>
-                </Grid>
-            </Border>
-           <!--第二行 内容-->
-            <Grid Grid.Row="1" Margin="0,15,0,0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="45"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-                <UniformGrid x:Name="uniStatisticsByTitle"
+        <Border Background="#fefefe" Height="729" Width="1030">
+            <Border Background="#fdfdfd" Height="727" Width="1028">
+                <Border Background="#fcfcfc" Height="725" Width="1026">
+                    <Border Background="#fafafa" Height="723" Width="1024">
+                        <Border Background="#f9f9f9" Height="721" Width="1022">
+                            <Border Background="#f6f6f6" Height="719" Width="1020">
+                                <Border Background="#f3f3f3" Height="717" Width="1018">
+                                    <Border Background="#eeeeee" Height="715" Width="1016">
+                                        <Border Background="#e9e9e9" Height="713" Width="1014">
+                                            <Border Background="#e2e2e2" Height="711" Width="1012">
+                                                <Border Background="#dcdcdc" Height="709" Width="1010">
+                                                    <Border Background="#d3d3d3" Height="707" Width="1008">
+                                                        <Border Background="#cccccc" Height="705" Width="1006">
+                                                            <Border Background="#bfbfbf" Height="703" Width="1004">
+                                                                <Border Background="#aeaeae" Height="701" Width="1002">
+                                                                    <Border Background="#bababa" Height="699" Width="1000">
+                                                                        <Border Background="#e4e4e4" Height="697" Width="998">
+                                                                            <Grid Height="695" Width="998" Background="#FFFFFF" Margin="0,-1,0,0">
+                                                                                <!--分4行-->
+                                                                                <Grid.RowDefinitions>
+                                                                                    <RowDefinition Height="45"/>
+                                                                                    <RowDefinition Height="*"/>
+                                                                                    <RowDefinition Height="30"/>
+                                                                                </Grid.RowDefinitions>
+                                                                                <!--第一行 标题-->
+                                                                                <Border Grid.Row="0" Background="#2D8CF0">
+                                                                                    <Grid  MouseLeftButtonDown="Window_MouseLeftButtonDown">
+                                                                                        <TextBlock Text="文件目录" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
+                                                                                        <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnDown_Click"/>
+                                                                                    </Grid>
+                                                                                </Border>
+                                                                                <!--第二行 内容-->
+                                                                                <Grid Grid.Row="1" Margin="0,15,0,0">
+                                                                                    <Grid.RowDefinitions>
+                                                                                        <RowDefinition Height="45"/>
+                                                                                        <RowDefinition Height="*"/>
+                                                                                    </Grid.RowDefinitions>
+                                                                                    <UniformGrid x:Name="uniStatisticsByTitle"
                 Grid.Row="0"
                 Margin="10,0,10,0"
                 Background="#2D8CF0"
                 Columns="5"
                 Rows="1">
-                    <TextBlock
+                                                                                        <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="序号" Foreground="White" />
-                    <TextBlock
+                                                                                        <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="视频名称" Foreground="White" />
-                    <!--<TextBlock
+                                                                                        <!--<TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
                     Text="视频时长" Foreground="White" />-->
-                    <TextBlock
+                                                                                        <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="视频大小" Foreground="White" />
-                    <TextBlock
+                                                                                        <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="日期" Foreground="White" />
-                    <TextBlock
+                                                                                        <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="操作" Foreground="White" />
-                </UniformGrid>
-                <ListBox Grid.Row="1"
+                                                                                    </UniformGrid>
+                                                                                    <ListBox Grid.Row="1"
                     x:Name="listView1"
                     BorderThickness="0"
                     FontSize="20"
@@ -183,24 +200,41 @@
                     ItemsSource="{Binding menuList}" 
                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
-            </Grid>
-            <!--第三行 删除 上传 按钮-->
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Height="32">
-                <TextBlock Text="共" FontSize="20" Padding="0,5,0,0"/>
-                <TextBlock x:Name="txbSum" Text="0" FontSize="20" Padding="0,5,0,0"/>
-                <TextBlock Text="条" FontSize="20" Padding="0,5,0,0"/>
-                <Button Background="Transparent"
+                                                                                </Grid>
+                                                                                <!--第三行 删除 上传 按钮-->
+                                                                                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Height="32">
+                                                                                    <TextBlock Text="共" FontSize="20" Padding="0,5,0,0"/>
+                                                                                    <TextBlock x:Name="txbSum" Text="0" FontSize="20" Padding="0,5,0,0"/>
+                                                                                    <TextBlock Text="条" FontSize="20" Padding="0,5,0,0"/>
+                                                                                    <Button Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Content="上一页" FontSize="20" Margin="10,0,0,0" >
-                    <!--<Image Source="./Images/class_p1.png"/>-->
-                </Button>
-                <Button Background="Transparent"
+                                                                                        <!--<Image Source="./Images/class_p1.png"/>-->
+                                                                                    </Button>
+                                                                                    <Button Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Content="下一页" FontSize="20" Margin="10,0,0,0" >
-                    <!--<Image Source="./Images/class_p2.png"/>-->
-                </Button>
-            </StackPanel>
-            
-        </Grid>
+                                                                                        <!--<Image Source="./Images/class_p2.png"/>-->
+                                                                                    </Button>
+                                                                                </StackPanel>
+
+                                                                            </Grid>
+                                                                        </Border>
+                                                                    </Border>
+                                                                </Border>
+                                                            </Border>
+                                                        </Border>
+                                                    </Border>
+                                                </Border>
+                                            </Border>
+                                        </Border>
+                                    </Border>
+                                </Border>
+                            </Border>
+                        </Border>
+                    </Border>
+                </Border>
+            </Border>
+        </Border>
     </Viewbox>
 </Window>

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -50,6 +50,7 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            APP.myloading.Show();
             MouseNumber = 0;
             IsModify = false;
             //加载视频列表
@@ -91,26 +92,33 @@ namespace XHWK.WKTool
                     vis = "Collapsed";
                     cos = "Visible";
                 }
-                pageData.menuList.Add(new FileDirectoryModel()
+                if (i <= 16)
                 {
-                    SerialNumber = i,
-                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                    Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                    FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
-                    VideoDuration = 0,
-                    VideoSize = videoinfo.VideoSize,
-                    VideoTime = videoinfo.RSTime,
-                    IsEnabled = false,
-                    Path = videoinfo.VideoPath,
-                    Colour = colour,
-                    Visi = vis,
-                    Coll = cos,
-                    FileGuid = videoinfo.FileGuid,
-                    VideoType = videoinfo.VideoType.ToString()
-                }); ;
+                    pageData.menuList.Add(new FileDirectoryModel()
+                    {
+                        SerialNumber = i,
+                        VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                        Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                        FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
+                        VideoDuration = 0,
+                        VideoSize = videoinfo.VideoSize,
+                        VideoTime = videoinfo.RSTime,
+                        IsEnabled = false,
+                        Path = videoinfo.VideoPath,
+                        Colour = colour,
+                        Visi = vis,
+                        Coll = cos,
+                        FileGuid = videoinfo.FileGuid,
+                        VideoType = videoinfo.VideoType.ToString()
+                    }); ;
+                }
+
+
+
                 i++;
             }
             txbSum.Text = pageData.menuList.Count.ToString();
+            APP.myloading.Hide();
             DataContext = pageData;
         }
         /// <summary>
@@ -202,7 +210,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDelete_Click(object sender, RoutedEventArgs e)
         {
-        
+
             pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnDelete");
             for (int i = 0; i < buttons.Count; i++)

XHWK.WKTool/LoginWindow.xaml

@@ -5,12 +5,29 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="LoginWindow" Height="341" Width="454"   AllowsTransparency="True"
+        Title="LoginWindow" Height="358" Width="471"   AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None">
     <Viewbox>
-        <Grid Height="341" Width="454" >
+        <Border Background="#fefefe" Height="358" Width="471">
+            <Border Background="#fdfdfd" Height="357" Width="470">
+                <Border Background="#fcfcfc" Height="356" Width="469">
+                    <Border Background="#fafafa" Height="355" Width="468">
+                        <Border Background="#f9f9f9" Height="354" Width="467">
+                            <Border Background="#f6f6f6" Height="353" Width="466">
+                                <Border Background="#f3f3f3" Height="352" Width="465">
+                                    <Border Background="#eeeeee" Height="351" Width="464">
+                                        <Border Background="#e9e9e9" Height="350" Width="463">
+                                            <Border Background="#e2e2e2" Height="349" Width="462">
+                                                <Border Background="#dcdcdc" Height="348" Width="461">
+                                                    <Border Background="#d3d3d3" Height="347" Width="460">
+                                                        <Border Background="#cccccc" Height="346" Width="459">
+                                                            <Border Background="#bfbfbf" Height="345" Width="458">
+                                                                <Border Background="#aeaeae" Height="344" Width="457">
+                                                                    <Border Background="#bababa" Height="343" Width="456">
+                                                                        <!--<Border Background="#e4e4e4" Height="342" Width="455">-->
+                                                                        <Grid Height="343" Width="456" Background="#FFFFFF">
             <!--分5行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="45"/>
@@ -30,19 +47,19 @@
             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
                 <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
                 <!--输入框-->
-                <Border Background="#CDD6E0" Width="371" Height="43" CornerRadius="3">
-                    <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                                                                                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+                    <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
             </StackPanel>
             <!--第三行 密码-->
             <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,0">
                 <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
                 <!--输入框-->
-                <Border Background="#CDD6E0" Width="371" Height="43" CornerRadius="3">
-                    <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="369" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                                                                                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+                    <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
             </StackPanel>
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,0,0,0">
+            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,10,0,0">
                 <Viewbox Height="23">
                     <CheckBox   x:Name="ckSaveName" Click="CkSaveName_Click"/>
                 </Viewbox>
@@ -50,13 +67,13 @@
             </StackPanel>
             
             <!--第五行 开始按钮-->
-            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
+            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="50" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
-                                CornerRadius="2">
+                                CornerRadius="7">
                             <Border.Background>#2D8CF0</Border.Background>
                             <ContentPresenter
                                     HorizontalAlignment="Center"
@@ -67,5 +84,22 @@
                 </Button.Template>
             </Button>
         </Grid>
+                                                                        </Border>
+                                                                    </Border>
+                                                                </Border>
+                                                            </Border>
+                                                        </Border>
+                                                    </Border>
+                                                </Border>
+                                            </Border>
+                                        </Border>
+                                    </Border>
+                                </Border>
+                            </Border>
+                        </Border>
+                    </Border>
+                </Border>
+            </Border>
+        <!--</Border>-->
     </Viewbox>
 </Window>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -68,6 +68,7 @@ namespace XHWK.WKTool
                 MessageBox.Show("密码未输入");
                 return;
             }
+            APP.myloading.Show();
             Login();
         }
         /// <summary>
@@ -99,7 +100,7 @@ namespace XHWK.WKTool
                     System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
                 }
 
-
+                APP.myloading.Hide();
                 //UpdateSettingString("userName", txbAccountNumber.Text);
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;
@@ -131,6 +132,7 @@ namespace XHWK.WKTool
             }
             else
             {
+                APP.myloading.Hide();
                 MessageBox.Show(APP.ServerMsg);
             }
         }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -8,16 +8,17 @@
         xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课系统" Height="1040" Width="1276" WindowStartupLocation="CenterScreen"
+        Title="星火微课系统" Height="1040" Width="1280" WindowStartupLocation="CenterScreen"
     WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize"
    >
     
     <Viewbox>
-        <Grid x:Name="GridContent" Height="1040">
+        <Border Background="#cdcdcd" Height="1040" Width="1280">
+            <Grid x:Name="GridContent" Height="1036" Width="1276">
 
             <!--分3行-->
             <Grid.RowDefinitions>
-                <RowDefinition Height="110"/>
+                <RowDefinition Height="106"/>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="40"/>
             </Grid.RowDefinitions>
@@ -124,10 +125,9 @@
                         </StackPanel>
                     </Button>
                 </StackPanel>
-                <Button Content="Button" HorizontalAlignment="Left" Margin="637,15,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
             </Grid>
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain" Width="1276">
+            <Grid Grid.Row="1" x:Name="GridMain" Width="1276" >
                 <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
                     <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
                         <Grid>
@@ -180,7 +180,7 @@
                 <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
             </Grid>
            <!--页码-->
-            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" Background="#FFFFFF">
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Center"
             Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
@@ -218,13 +218,6 @@
                     </Button>
                 </StackPanel>
             </Grid>
-            <!--Loding-->
-            <Grid Grid.Row="1">
-                <Image x:Name="imgLoad"
-                    Width="300"
-                    Height="300"
-                    gifLib:ImageBehavior.AnimatedSource="./Images/img_load.gif" VerticalAlignment="Top" Margin="0,200,0,0" Visibility="Collapsed"/>
-            </Grid>
             <!--设置-->
             <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
                 <Grid.RowDefinitions>
@@ -309,7 +302,7 @@
                     </Button.Template>
                 </Button>
             </Grid>
-            <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,2,0,0">
+            <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
                     <TextBlock Text="颜色：" FontSize="14" Padding="10,10,0,0"/>
                     <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0"/>
@@ -334,5 +327,6 @@
                 </StackPanel>
             </Grid>
         </Grid>
+        </Border>
     </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -915,7 +915,7 @@ namespace XHWK.WKTool
             {
                 if (ofd.FileName != "")
                 {
-                    imgLoad.Visibility = Visibility.Visible;
+                    APP.myloading.Show();
 
                     #region PPT转PDF
                     string filepath = ofd.FileName;
@@ -1017,11 +1017,11 @@ namespace XHWK.WKTool
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                 btnScreenshot.IsEnabled = true;
                             }
-                            imgLoad.Visibility = Visibility.Collapsed;
+                            APP.myloading.Hide();
                         }
                         catch (Exception ex)
                         {
-                            imgLoad.Visibility = Visibility.Collapsed;
+                            APP.myloading.Hide();
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PPT)" + ex.Message, ex);
                         }
                     }
@@ -1079,11 +1079,11 @@ namespace XHWK.WKTool
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                 btnScreenshot.IsEnabled = true;
                             }
-                            imgLoad.Visibility = Visibility.Collapsed;
+                            APP.myloading.Hide();
                         }
                         catch (Exception ex)
                         {
-                            imgLoad.Visibility = Visibility.Collapsed;
+                            APP.myloading.Hide();
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
                     }
@@ -2528,6 +2528,9 @@ namespace XHWK.WKTool
             //Common.system.SplashScreen.Show(typeof(LoadDialog));
             //Thread.Sleep(5000);
             //Common.system.SplashScreen.Close();
+            APP.myloading.Show();
+            Thread.Sleep(1000);
+            APP.myloading.Hide();
         }
     }
 }