zhao：解决冲突

Common/system/ImageHelper.cs

@@ -3,6 +3,7 @@ using System.Configuration;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
+using System.Security.Policy;
 using System.Text;
 using System.Threading;
 using System.Windows;
@@ -111,10 +112,13 @@ namespace Common.system
         /// </summary>
         /// <param name="ScreenSize">截图的区域，设置new Rectangle(0, 0, 0, 0)为截全屏</param>
         /// <param name="ImageSavePath">图片存储路径，为空或null则保存到临时文件夹</param>
+        /// <param name="IsRetImg">是否返回图片</param>
+        /// <param name="bitmapimg">图片</param>
         /// <param name="level">压缩等级，0到100，0 最差质量，100 最佳</param>
         /// <returns></returns>
-        public static BitmapImage GetScreenshot(Rectangle ScreenSize, string ImageSavePath, long level = -1)
+        public static bool GetScreenshot(Rectangle ScreenSize, string ImageSavePath, bool IsRetImg, out BitmapImage bitmapimg, long level = -1)
         {
+            bitmapimg = null;
             try
             {
                 System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
@@ -143,15 +147,19 @@ namespace Common.system
                     g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
                     Compress(_Bitmap, ImageSavePath, level);
                 }
-                Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
-                BitmapImage bimg = new BitmapImage(uri);
+                if (IsRetImg)
+                {
+
+                    Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
+                    bitmapimg = new BitmapImage(uri);
+                }
                 GC.Collect();
-                return bimg;
+                return true;
             }
             catch (Exception ex)
             {
                 LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
-                return null;
+                return false;
             }
         }
         /// <summary>
@@ -161,8 +169,8 @@ namespace Common.system
         public static string GetTempImagePath()
         {
             TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            
-            string TempPath=FileToolsCommon.GetFileAbsolutePath("/temp/Screenshot/");
+
+            string TempPath = FileToolsCommon.GetFileAbsolutePath("/temp/Screenshot/");
             FileToolsCommon.CreateDirectory(TempPath);
             TempPath += Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".jpg";
             return TempPath;
@@ -468,7 +476,7 @@ namespace Common.system
                     break;
             }
 
-            if(right - left<=0)//zxyceshi
+            if (right - left <= 0)//zxyceshi
             {
                 //克隆位图对象的一部分。
                 System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, 1, bottom - top);
@@ -486,7 +494,7 @@ namespace Common.system
                 //cloneBitmap.Save(@"d:\123.png", ImageFormat.Png);
                 return cloneBitmap;
             }
-         
+
         }
 
         /// <summary>

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,16 +31,16 @@
         </Style>
         <DataTemplate x:Key="TongjiItem">
             <UniformGrid
-                Height="36"
+                Height="50"
                 Margin="0,0,0,0"
                 Background="{Binding Colour}"
-                Columns="6"
+                Columns="5"
                 Rows="1">
                 <!--题号-->
                 <TextBlock 
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="15"
+                    FontSize="16"
                     Text="{Binding SerialNumber}" />
                 <Grid>
                     <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
@@ -48,38 +48,38 @@
                         <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>
                 </Grid>
           
            
-                <!--分值-->
+                <!--分值--><!--
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
-                    Text="{Binding VideoDuration}" />
+                    Text="{Binding VideoDuration}" />-->
 
                 <!--平均时长-->
                 <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="80"/>
-            </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="6"
+                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
+                    Text="视频时长" Foreground="White" />-->
+                                                                                        <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,33 +200,41 @@
                     ItemsSource="{Binding menuList}" 
                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
-            </Grid>
-            <!--第三行 删除 上传 按钮-->
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" 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">
-                    <Image Source="./Images/class_p1.png"/>
-                </Button>
-                <Button Background="Transparent"
-                                Cursor="Hand"
-                        BorderThickness="0" Content="1" FontSize="20" Width="30"/>
-                <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="2" FontSize="20" Width="30"/>
-                <Button Background="Transparent"
+                        BorderThickness="0" Content="上一页" FontSize="20" Margin="10,0,0,0" >
+                                                                                        <!--<Image Source="./Images/class_p1.png"/>-->
+                                                                                    </Button>
+                                                                                    <Button Background="Transparent"
                                 Cursor="Hand"
-                        BorderThickness="0" Content="3" FontSize="20" Width="30"/>
-                <Button Background="Transparent"
-                                Cursor="Hand"
-                        BorderThickness="0">
-                    <Image Source="./Images/class_p2.png"/>
-                </Button>
-            </StackPanel>
-            
-        </Grid>
+                        BorderThickness="0" Content="下一页" FontSize="20" Margin="10,0,0,0" >
+                                                                                        <!--<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>
@@ -210,7 +218,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/JieTuWindow.xaml.cs

@@ -81,7 +81,8 @@ namespace ComeCapture
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            Background = new ImageBrush(ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), null));
+            if (ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), null, true, out BitmapImage bitmap))
+                Background = new ImageBrush(bitmap);
         }
 
         public void initialization()
@@ -233,7 +234,7 @@ namespace ComeCapture
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
 
             //BitmapSource bitmap = ImageHelper.GetBitmapSource((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2, out JieTuBitmapPtr);
-            BitmapImage bitmap = ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath);
+           /* BitmapImage bitmap = */ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath,true,out BitmapImage bitmapimg);
             _IsMouseDown = false;
             _IsCapture = false;
             ImageEditBar.Current.Visibility = Visibility.Collapsed;
@@ -241,18 +242,19 @@ namespace ComeCapture
             SizeRGB.Visibility = Visibility.Collapsed;
             MainImage.Visibility = Visibility.Collapsed;
             DataContext = new AppModel();
-            Background = new ImageBrush(ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath));//zxy
+            ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);//zxy
+            Background = new ImageBrush(bitmap);
             WpfHelper.MainDispatcher = Dispatcher;
             MaxWindow();
             MaskLeft.Height = ScreenHeight;
             MaskRight.Height = ScreenHeight;
             //计算Windows项目缩放比例
             ScreenHelper.ResetScreenScale();
-            if (bitmap != null)
-            {
-                //Shared.TeachingData.REQ_InteractiveLaunch.teacherpic = serverSavePath;
-                //Shared.TeachingData.FilePath = imagePath;
-            }
+            //if (bitmap != null)
+            //{
+            //    //Shared.TeachingData.REQ_InteractiveLaunch.teacherpic = serverSavePath;
+            //    //Shared.TeachingData.FilePath = imagePath;
+            //}
 
             ///修改为统一截图时存储到服务器 修改人：赵耀 修改时间：2020年8月11日
             //if (bitmap != null)

XHWK.WKTool/LoadDialog.xaml

@@ -0,0 +1,239 @@
+<Window x:Class="XHWK.WKTool.LoadDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XHWK.WKTool"
+        mc:Ignorable="d"
+        Title="LoadDialog"  Width="100"
+    Height="100"
+    AllowsTransparency="True"
+    Background="Transparent"
+    Opacity="1"
+    ResizeMode="NoResize"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None">
+    <Grid>
+        <Border Background="#66000000" CornerRadius="10 10 10 10">
+            <Grid Width="60" Height="60">
+                <Grid.Resources>
+                    <DrawingBrush
+                        x:Key="brush"
+                        AlignmentX="Center"
+                        AlignmentY="Top"
+                        Stretch="None">
+                        <DrawingBrush.Drawing>
+                            <GeometryDrawing Brush="White">
+                                <GeometryDrawing.Geometry>
+                                    <EllipseGeometry RadiusX="2" RadiusY="5" />
+                                </GeometryDrawing.Geometry>
+                            </GeometryDrawing>
+                        </DrawingBrush.Drawing>
+                    </DrawingBrush>
+                </Grid.Resources>
+
+                <Rectangle
+                    x:Name="r01"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="0" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r02"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="30" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r03"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="60" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r04"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="90" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r05"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="120" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r06"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="150" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r07"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="180" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r08"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="210" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r09"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="240" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r10"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="270" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r11"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="300" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Rectangle
+                    x:Name="r12"
+                    Fill="{StaticResource brush}"
+                    Opacity="0.8"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                        <RotateTransform Angle="330" />
+                    </Rectangle.RenderTransform>
+                </Rectangle>
+                <Grid.Triggers>
+                    <EventTrigger RoutedEvent="Grid.Loaded">
+                        <BeginStoryboard>
+                            <Storyboard RepeatBehavior="Forever">
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.00000"
+                                    Storyboard.TargetName="r01"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.08333"
+                                    Storyboard.TargetName="r02"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.16666"
+                                    Storyboard.TargetName="r03"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.24999"
+                                    Storyboard.TargetName="r04"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.33332"
+                                    Storyboard.TargetName="r05"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.41665"
+                                    Storyboard.TargetName="r06"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.49998"
+                                    Storyboard.TargetName="r07"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.58331"
+                                    Storyboard.TargetName="r08"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.66664"
+                                    Storyboard.TargetName="r09"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.74997"
+                                    Storyboard.TargetName="r10"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.83330"
+                                    Storyboard.TargetName="r11"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                                <DoubleAnimation
+                                    AutoReverse="True"
+                                    BeginTime="0:0:0.91663"
+                                    Storyboard.TargetName="r12"
+                                    Storyboard.TargetProperty="Opacity"
+                                    To="0"
+                                    Duration="0:0:0.08333" />
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </EventTrigger>
+                </Grid.Triggers>
+            </Grid>
+        </Border>
+    </Grid>
+</Window>

XHWK.WKTool/LoadDialog.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// LoadDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class LoadDialog : Window
+    {
+        public LoadDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

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/PracticeWindow.xaml.cs

@@ -33,7 +33,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 当前画笔颜色
         /// </summary>
-        Color Colour=Colors.Black;
+        Color Colour=Colors.Red;
         /// <summary>
         /// 当前画笔宽
         /// </summary>
@@ -111,15 +111,15 @@ namespace XHWK.WKTool
             Colour = Colors.Red;
         }
         /// <summary>
-        /// 画笔颜色事件 灰色
+        /// 画笔颜色事件 黑色
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         public void Gray()
         {
             //flg = 0;
-            drawingAttributes.Color = Colors.Gray;
-            Colour = Colors.Gray;
+            drawingAttributes.Color = Colors.Black;
+            Colour = Colors.Black;
         }
         /// <summary>
         /// 画笔颜色事件 青色

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -13,7 +13,7 @@
         <SolidColorBrush Opacity="0" Color="#292C2E" />
     </Window.Background>
     <Viewbox>
-        <Grid>
+        <Grid MouseLeftButtonDown="Grid_MouseLeftButtonDown">
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
@@ -21,7 +21,7 @@
             <Image x:Name="imgCanvas" Visibility="Collapsed"/>
             <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Collapsed" Grid.RowSpan="2" />
             <!--画笔工具栏-->
-            <Grid Grid.Row="0" x:Name="gridToolbar" Visibility="Visible">
+            <Grid Grid.Row="0" x:Name="gridToolbar" Visibility="Collapsed">
                 <Image Grid.Row="0"  Source="./Images/Toobar22.png" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,5,10,0">
                     <Button  Cursor="Hand" x:Name="btnToolbarDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnToolbarDown_Click">
@@ -51,7 +51,7 @@
                 </StackPanel>
             </Grid>
             <!--字体颜色-->
-            <Grid Grid.Row="0" x:Name="gridColour" Visibility="Visible">
+            <Grid Grid.Row="0" x:Name="gridColour" Visibility="Collapsed">
                 <Image Source="./Images/Toobar20.png" HorizontalAlignment="Right" Margin="0,200,62,0"/>
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Right" Margin="0,215,68,0">
                     <Button  Cursor="Hand" x:Name="btnWhite" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="15" Width="15" Margin="0,0,0,0" Click="BtnWhite_Click"/>
@@ -81,7 +81,7 @@
                 <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnStopRecordingScreen_Click">
                     <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar14.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBrush" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBrush_Click">
+                <Button  Cursor="Hand" x:Name="btnBlackPen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBlackPen_Click">
                     <Image Source="./Images/Toobar8.png"/>
                 </Button>
             </StackPanel>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -371,7 +371,7 @@ namespace XHWK.WKTool
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath);
+            //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath);
             if (gridToolbar.Visibility == Visibility.Visible)
             {
                 gridToolbar.Visibility = Visibility.Hidden;
@@ -590,6 +590,23 @@ namespace XHWK.WKTool
         /// 停止录屏
         /// </summary>
         public event StopRecordingScreen Click_stopRecordingScreen;
+        /// <summary>
+        /// 黑笔
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnBlackPen_Click(object sender, RoutedEventArgs e)
+        {
 
+        }
+        /// <summary>
+        /// 移动工具栏
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Grid_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
          xmlns:wfi ="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration"
         xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
+        xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="星火微课系统" Height="1040" Width="1276" WindowStartupLocation="CenterScreen"
@@ -29,11 +30,12 @@
     </Window.BorderBrush>
 
     <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>
@@ -101,6 +103,7 @@
                             <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
+                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
                     <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
@@ -117,12 +120,19 @@
                             <TextBlock Text="打印" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click" Margin="0,0,30,0">
+                    <!--<Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click" Margin="0,0,30,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_15.png" Visibility="Collapsed"/>
                             <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_16.png" Visibility="Visible"/>
                             <TextBlock Text="上传" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
+                    </Button>-->
+                    <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnUpload_Click">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
+                            <TextBlock Text="我的" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnSetUp_Click">
                         <StackPanel Orientation="Vertical">
@@ -134,65 +144,66 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
-            <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>
-                            <Border Grid.Row="1"  CornerRadius="5">
-                                <Grid x:Name="IMG" Margin="0,0,0,0">
-                                    <Grid.Resources>
-                                        <TransformGroup x:Key="Imageview">
-                                            <ScaleTransform/>
-                                            <TranslateTransform/>
-                                        </TransformGroup>
-                                    </Grid.Resources>
+                <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>
+                                <Border Grid.Row="1"  CornerRadius="5">
+                                    <Grid x:Name="IMG" Margin="0,0,0,0">
+                                        <Grid.Resources>
+                                            <TransformGroup x:Key="Imageview">
+                                                <ScaleTransform/>
+                                                <TranslateTransform/>
+                                            </TransformGroup>
+                                        </Grid.Resources>
 
-                                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
+                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
-                                        <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
+                                            <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                            <Image Name="imgCanvas" Width="635" Height="auto" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}">
-                                            </Image>
-                                        </ContentControl>
-                                    </ScrollViewer>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                        <Image x:Name="imgDocumentation"/>
-                        <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
-                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
-                        <!--摄像头-->
-                        <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
+                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown">
+                                                </Image>
+                                            </ContentControl>
+                                        </ScrollViewer>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                            <!--导入图片-->
+                            <Image x:Name="imgDocumentation"/>
+                            <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
+                            <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
+                            <!--摄像头-->
+                            <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
                     <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
                 </wfi:WindowsFormsHost>-->
-
-
-
-
-                    </Grid>
-                </ScrollViewer>
-                <Image x:Name="imgPlayerLeft" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
-                <Label Content="" Grid.Column="0" Height="2" Width="2" HorizontalAlignment="Left"  VerticalAlignment="Top" Background="#FF0F0F0F" Margin="1,0,0,0"/>
-                <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
-                <Label Content="" Grid.Column="0" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
-                <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">
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Center"
-            Height="58" Margin="0,520,0,0" Grid.Column="1" VerticalAlignment="Bottom">
+                            <!--<Image x:Name="imgLoad"
+                    Width="300"
+                    Height="300"
+                    gifLib:ImageBehavior.AnimatedSource="./Images/img_load.gif" VerticalAlignment="Top" Margin="0,200,0,0" Visibility="Visible"/>-->
+                        </Grid>
+                    </ScrollViewer>
+                    <Image x:Name="imgPlayerLeft" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                    <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                    <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                    <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                    <Label Content="" Grid.Column="0" Height="2" Width="2" HorizontalAlignment="Left"  VerticalAlignment="Top" Background="#FF0F0F0F" Margin="1,0,0,0"/>
+                    <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
+                    <Label Content="" Grid.Column="0" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
+                    <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" 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}}"
                     x:Name="last_button"
-                    Width="60" Height="50"
+                    Width="60" Height="20"
                     Click="last_button_Click">
                         <Button.Content>
                             <StackPanel>
-                                <Image Width="16" Source=".\Images\class_p1.png" />
+                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
                             </StackPanel>
                         </Button.Content>
                     </Button>
@@ -201,8 +212,7 @@
                             <RowDefinition Height="311*"/>
                             <RowDefinition Height="483*"/>
                         </Grid.RowDefinitions>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-25,0,0" Grid.Row="1"  Background="Transparent">
-
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
                             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
                                 <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15"/>
                                 <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
@@ -212,11 +222,11 @@
                     </Grid>
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="next_btn"  Background="Transparent"
-                    Width="60" Height="50"
+                    Width="60" Height="20"
                     Click="next_btn_Click">
                         <Button.Content>
                             <StackPanel>
-                                <Image Width="16" Source=".\Images\class_p2.png" />
+                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
                             </StackPanel>
                         </Button.Content>
                     </Button>
@@ -306,12 +316,12 @@
                     </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"/>
                     <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click"/>
-                    <Button Cursor="Hand" x:Name="btnGray" Background="#A7A9AC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click"/>
+                    <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click"/>
                     <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click"/>
                     <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click"/>
                     <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click"/>
@@ -331,5 +341,6 @@
                 </StackPanel>
             </Grid>
         </Grid>
+        </Border>
     </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -23,7 +23,7 @@ using XHWK.WKTool.DAL;
 using System.Text;
 using System.Collections.Specialized;
 using XHWK.WKTool.Config;
-using System.Windows.Media.Converters;
+using System.Windows.Threading;
 
 namespace XHWK.WKTool
 {
@@ -56,11 +56,29 @@ namespace XHWK.WKTool
         /// <summary>
         /// 当前颜色
         /// </summary>
-        private System.Windows.Media.Color Color = System.Windows.Media.Colors.Black;
+        private System.Windows.Media.Color Color = System.Windows.Media.Colors.Red;
         /// <summary>
         /// 笔迹粗细
         /// </summary>
         private int PenSize = 2;
+        private DispatcherTimer t = null;
+        /// <summary>
+        /// 计时器状态
+        /// </summary>
+        private enum State
+        {
+            Start,
+            Pause,
+            End
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        private State _state = State.End;
+        /// <summary>
+        /// 计时用
+        /// </summary>
+        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
         #endregion
 
         #region 初始化
@@ -106,6 +124,7 @@ namespace XHWK.WKTool
             #region 数据初始化
             APP.pageData.pagenum = 0;
             APP.pageData.currpage = APP.pageData.pagenum;
+            btnStop.IsEnabled = false;//停止录制按钮不可点击
             #endregion
 
 
@@ -126,6 +145,63 @@ namespace XHWK.WKTool
             //wfhCamera.Visibility = Visibility.Hidden;
             ImgPDFPath = null;
             ImgPDFPath = new string[300];
+          
+        }
+        /// <summary>
+        /// 开始
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Stack()
+        {
+            _state = State.Start;
+        }
+        /// <summary>
+        /// 暂停
+        /// </summary>
+        private void TimeOut()
+        {
+            _state = State.Pause;
+        }
+        /// <summary>
+        /// 结束
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void End()
+        {
+            _state = State.End;
+        }
+        /// <summary>
+        /// 时钟回调
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnTimer(object sender, EventArgs e)
+        {
+            switch (_state)
+            {
+                case State.Start:
+                    {
+                        _timeSpan += new TimeSpan(0, 0, 0, 1);
+                    }
+                    break;
+
+                case State.Pause:
+                    {
+                    }
+                    break;
+
+                case State.End:
+                    {
+                        _timeSpan = new TimeSpan();
+                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
+                    }
+                    break;
+            }
+
+            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
+            //txbTime.Text = time;
         }
         /// <summary>
         /// 修改布局
@@ -351,7 +427,6 @@ namespace XHWK.WKTool
             }))).Start();
 
         }
-
         /// <summary>
         /// 上传事件
         /// </summary>
@@ -448,6 +523,9 @@ namespace XHWK.WKTool
             //}
             #endregion
 
+            ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
+            ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
+            BtnRecord.IsEnabled = true;//设置结束时可录制
             if (rbnMP4.IsChecked == true)
             {
                 //存储文件
@@ -506,6 +584,9 @@ namespace XHWK.WKTool
                 GridMain.Visibility = Visibility.Collapsed;
                 gridSetUp.Visibility = Visibility.Visible;
                 txbStoragePath.Content = APP.WKData.WkPath;
+                ImgRecord.Visibility = Visibility.Collapsed;//设置时不可录制
+                ImgRecordTwo.Visibility = Visibility.Visible;//设置时不可录制
+                BtnRecord.IsEnabled = false;//设置时不可录制
                 ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
                 if ("1".Equals(APP.CameraPosition))
                 {
@@ -579,14 +660,14 @@ namespace XHWK.WKTool
             Color = Colors.Red;
         }
         /// <summary>
-        /// 画笔颜色事件 灰色
+        /// 画笔颜色事件 黑色
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void BtnGray_Click(object sender, RoutedEventArgs e)
         {
-            drawingAttributes.Color = Colors.Gray;
-            Color = Colors.Gray;
+            drawingAttributes.Color = Colors.Black;
+            Color = Colors.Black;
         }
         /// <summary>
         /// 画笔颜色事件 青色
@@ -701,8 +782,11 @@ namespace XHWK.WKTool
         {
             string time = GetTimeStamp();
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + time + ".jpg";
-            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), desktopPath);
-
+            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), desktopPath,false,out BitmapImage bitmap);
+            if (this.WindowState == WindowState.Normal)//截图隐藏窗口
+            {
+                this.WindowState = WindowState.Minimized;
+            }
             if (APP.W_JieTuWindow != null)
             {
                 APP.W_JieTuWindow.initialization();
@@ -729,12 +813,17 @@ namespace XHWK.WKTool
         {
             if ("关闭窗口".Equals(text))
             {
+                if (this.WindowState == WindowState.Minimized)//截图完恢复窗口
+                {
+                    this.WindowState = WindowState.Normal;
+                }
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
                     if (APP.pageData.currpage == 0)
                     {
                         APP.pageData.pagenum += 1;
                         APP.pageData.currpage = APP.pageData.pagenum;
+                        gridPage.Visibility = Visibility.Visible;//页码大于0 显示
                     }
                     if (APP.PageDrawList.Count >= APP.pageData.currpage)
                     {
@@ -748,18 +837,10 @@ namespace XHWK.WKTool
                         model_DrawData.PdfImagePath = APP.ImgPath;
                         APP.PageDrawList.Add(model_DrawData);
                     }
-                    //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
-                    //{
-                    //    //imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
-                    //    imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage-1].PageImagePath));
-                    //}
                     if (APP.PageDrawList.Count >= APP.pageData.currpage && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
-                        //imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
                         imgDocumentation.Source = null;
                         imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                        //btnOk.Visibility = Visibility.Visible;
-                        //blackboard_canvas.Visibility = Visibility.Collapsed;
                         APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation = false;
                         ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
                         ImgPrintTwo.Visibility = Visibility.Collapsed;
@@ -773,6 +854,10 @@ namespace XHWK.WKTool
         /// </summary>
         private void JietuWindow_click_closeJietuWindowClick()
         {
+            if (this.WindowState == WindowState.Minimized)//截图完恢复窗口
+            {
+                this.WindowState = WindowState.Normal;
+            }
             APP.W_JieTuWindow = null;
         }
         /// <summary>
@@ -832,6 +917,8 @@ namespace XHWK.WKTool
             {
                 if (ofd.FileName != "")
                 {
+                    APP.myloading.Show();
+
                     #region PPT转PDF
                     string filepath = ofd.FileName;
                     string path = ofd.SafeFileName.Replace(".ppt", "").Trim();
@@ -913,6 +1000,7 @@ namespace XHWK.WKTool
                             {
                                 APP.pageData.currpage = APP.pageData.pagenum + 1;
                                 APP.pageData.pagenum += num;
+                                gridPage.Visibility = Visibility.Visible;//页码大于0 显示
                             }
                             if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
@@ -931,9 +1019,11 @@ namespace XHWK.WKTool
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                 btnScreenshot.IsEnabled = true;
                             }
+                            APP.myloading.Hide();
                         }
                         catch (Exception ex)
                         {
+                            APP.myloading.Hide();
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PPT)" + ex.Message, ex);
                         }
                     }
@@ -991,9 +1081,11 @@ namespace XHWK.WKTool
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                 btnScreenshot.IsEnabled = true;
                             }
+                            APP.myloading.Hide();
                         }
                         catch (Exception ex)
                         {
+                            APP.myloading.Hide();
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
                     }
@@ -1064,6 +1156,8 @@ namespace XHWK.WKTool
                 System.Windows.MessageBox.Show("请先导入文档或截图！");
                 return;
             }
+
+            //btnStop.IsEnabled = true;//停止录制按钮可点击
             StartRecord();
         }
         /// <summary>
@@ -1093,6 +1187,19 @@ namespace XHWK.WKTool
             {
                 if (IsFirstR)//是否第一次录制  初始化录制
                 {
+                    #region 计时器初始化
+                    if (t == null)
+                    {
+                        t = new DispatcherTimer();
+                        t.Tick += OnTimer;
+                        t.Interval = new TimeSpan(0, 0, 0, 1);
+                        t.IsEnabled = true;
+                        t.Start();
+                    }
+                    t.Interval = new TimeSpan(0, 0, 0, 1);
+                    Stack(); 
+                    #endregion
+
                     VideoInfo = new Model_Video();
                     VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
                     VideoInfo.WkType = Enum_WKVidetype.RecordingLessons;
@@ -1162,7 +1269,19 @@ namespace XHWK.WKTool
 
                     btnLoginType.IsEnabled = false;
                     #endregion
-
+                    #region 录像倒计时
+                    if (APP.W_CountdownWindow == null)
+                    {
+                        APP.W_CountdownWindow = new CountdownWindow();
+                        //APP.W_CountdownWindow.Topmost = true;
+                    }
+                    else
+                    {
+                        APP.W_CountdownWindow.Initialize();
+                        //APP.W_CountdownWindow.Topmost = true;
+                    }
+                    APP.W_CountdownWindow.Show();
+                    #endregion
                     IsFirstR = false;
                     RsImgName = new List<string>();
                     timer = new System.Timers.Timer(200);//设置执行一次（false）还是一直执行(true)
@@ -1170,19 +1289,7 @@ namespace XHWK.WKTool
                     timer.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Elapsed);
                     timer.Enabled = true; //启动计时器
                 }
-                #region 录像倒计时
-                if (APP.W_CountdownWindow == null)
-                {
-                    APP.W_CountdownWindow = new CountdownWindow();
-                    //APP.W_CountdownWindow.Topmost = true;
-                }
-                else
-                {
-                    APP.W_CountdownWindow.Initialize();
-                    //APP.W_CountdownWindow.Topmost = true;
-                }
-                APP.W_CountdownWindow.Show();
-                #endregion
+            
                 //继续录制
                 IsSuspendR = false;
                 //BtnRecording.Content = "暂停录制";
@@ -1323,13 +1430,17 @@ namespace XHWK.WKTool
                 btnSetUp.IsEnabled = true;
 
                 btnLoginType.IsEnabled = true;
+
+
+                //btnStop.IsEnabled = false;//停止录制按钮不可点击
+
                 #endregion
 
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
-                TxbRecordingWord.Text = "保存中";
+                txbType.Text = "保存中";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -1391,6 +1502,7 @@ namespace XHWK.WKTool
                             BtnRecord.IsEnabled = true;
                             btnStop.IsEnabled = true;
                             TxbRecordingWord.Text = "录制";
+                            txbType.Text = "";
                         });
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1434,6 +1546,7 @@ namespace XHWK.WKTool
                 blackboard_canvas.Visibility = Visibility.Visible;
             }
             APP.pageData.pagenum += 1;
+            gridPage.Visibility = Visibility.Visible;//页码大于0 显示
             APP.pageData.currpage = APP.pageData.pagenum;
             myblackboard.changepage(APP.pageData.currpage - 1);
             ///清空页面图片UI
@@ -2460,6 +2573,24 @@ namespace XHWK.WKTool
         /// </summary>
         [System.Runtime.InteropServices.DllImport("user32.dll")]
         private static extern int SetCursorPos(int x, int y);
+        /// 截图的图片鼠标右键事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void imgCanvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            imgCanvas.Source = null;
+        }
 
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            //System.Windows.SplashScreen(LoadDialog);
+            //Common.system.SplashScreen.Show(typeof(LoadDialog));
+            //Thread.Sleep(5000);
+            //Common.system.SplashScreen.Close();
+            APP.myloading.Show();
+            Thread.Sleep(1000);
+            APP.myloading.Hide();
+        }
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -135,6 +135,9 @@
     <Compile Include="JieTuWindow.xaml.cs">
       <DependentUpon>JieTuWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="LoadDialog.xaml.cs">
+      <DependentUpon>LoadDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="LoginWindow.xaml.cs">
       <DependentUpon>LoginWindow.xaml</DependentUpon>
     </Compile>
@@ -181,6 +184,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="LoadDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="PracticeWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1515,5 +1522,8 @@
   <ItemGroup>
     <Resource Include="Images\APP.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\img_load.gif" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

XHWK.WKTool/ZConfig.cs

@@ -13,9 +13,9 @@ namespace XHWK.WKTool.Config
         /// <summary>
         /// 当前版本号
         /// </summary>
-        public static int versionCode = 1;
+        public static int versionCode = 2;
 
-        public static string versionName = "1.0.0";
+        public static string versionName = "1.0.1";
 
         //接口地址
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";