zhao：1缩略图增加大小设置，缩小缩略图，2增加不占用图片方式打开图片 3修改我的，列表显示改为缩略图显示

Common/system/FFMpeg.cs

@@ -566,7 +566,9 @@ namespace Common.system
         /// </summary>
         /// <param name="VideoPath">视频地址</param>
         /// <param name="ImagePath">图片地址</param>
-        public bool GenerateThumbnails(string VideoPath, string ImagePath)
+        /// <param name="Width">图片大小</param>
+        /// <param name="Height">图片大小</param>
+        public bool GenerateThumbnails(string VideoPath, string ImagePath,int Width=0,int Height=0)
         {
             while (myProcess != null)
             {
@@ -577,13 +579,18 @@ namespace Common.system
             {
                 KillProcess.Kill();
             }
+            string WHStr = "";
+            if(Width>0)
+            {
+                WHStr = " -s "+ Width + "x"+ Height;
+            }
             try
             {
                 myProcess = new Process();
                 LogPath = CreateffmpegLog();
                 myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
                                                                                                                  //myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -s " + thubWidth + "*" + thubHeight + " -f image2 \"" + ImagePath + "\"";
-                myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -f image2 \"" + ImagePath + "\"";
+                myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2"+ WHStr + " -f image2 \"" + ImagePath + "\"";
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
                 myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口

Common/system/ImageHelper.cs

@@ -78,6 +78,33 @@ namespace Common.system
                 return null;
             }
         }
+        /// <summary>
+        /// 通过FileStream 来打开文件，这样就可以实现不锁定Image文件，到时可以让多用户同时访问Image文件
+        /// </summary>
+        /// <param name="path">图片位置</param>
+        /// <returns></returns>
+        public static BitmapImage ReadBitmapImageFile(string path)
+        {
+            BitmapImage bitmap = new BitmapImage();
+            try
+            {
+                using (MemoryStream ms = new MemoryStream(File.ReadAllBytes(path)))
+                {
+                    bitmap = new BitmapImage();
+                    bitmap.DecodePixelHeight = 100;
+                    bitmap.BeginInit();
+                    bitmap.CacheOption = BitmapCacheOption.OnLoad;//设置缓存模式
+                    bitmap.StreamSource = ms;//通过StreamSource加载图片
+                    bitmap.EndInit();
+                    bitmap.Freeze();
+                }
+                return bitmap; 
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
         #region 获取RGB
 
         private static Bitmap _Bitmap = null;

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -504,7 +504,7 @@ namespace XHWK.WKTool
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
-                        APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
+                        APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName,200,130);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();
                         VideoInfo.IsUpload = false;
                         VideoInfo.Uploaded = 0;

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -0,0 +1,37 @@
+<UserControl x:Class="XHWK.WKTool.UControl.Uc_VideoItem"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:XHWK.WKTool.UControl"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="250">
+    <Grid>
+        <Button x:Name="BtnVideoPlay" HorizontalAlignment="Center" Width="200" Height="130" Margin="25,10,25,0" VerticalAlignment="Top" Cursor="Hand" Click="BtnVideoPlay_Click">
+            <Image x:Name="ImgVideo" VerticalAlignment="Top"  Width="200" Height="130" Margin="0,0,0,0" Cursor="Hand" Stretch="Fill"/>
+        </Button>
+        <Image x:Name="ImgVideoPlay" Source="/星火微课;component/Images/VideoList_Play.png" HorizontalAlignment="Center" VerticalAlignment="Top" Width="60" Margin="0,50,0,0" Cursor="Hand" MouseLeftButtonDown="Image_MouseLeftButtonDown" />
+        <TextBlock x:Name="TbName" Text="一二三四五六七八九十..." HorizontalAlignment="Center" Margin="15,160,15,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="#FF3492F4" FontSize="18" TextAlignment="Center" ToolTip="" Visibility="Visible" MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/>
+        <TextBox x:Name="TxtModify" HorizontalAlignment="Left" Height="30" Margin="25,157,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="180" FontSize="16" Visibility="Hidden" LostFocus="TxtModify_LostFocus" KeyUp="TxtModify_KeyUp">
+            <TextBox.Resources>
+                <Style TargetType="{x:Type Border}">
+                    <Setter Property="CornerRadius" Value="3"/>
+                    <Setter Property="BorderBrush" Value="#3492F4"/>
+                </Style>
+            </TextBox.Resources>
+        </TextBox>
+        <Button x:Name="BtnNameModifyOK" HorizontalAlignment="Left" Margin="200,157,0,0" VerticalAlignment="Top" Width="30" Height="30" Background="White" BorderBrush="#FFABADB3" Click="BtnNameModifyOK_Click" Visibility="Hidden">
+            <Button.Resources>
+                <Style TargetType="{x:Type Border}">
+                    <Setter Property="CornerRadius" Value="3"/>
+                    <Setter Property="BorderBrush" Value="#3492F4"/>
+                </Style>
+            </Button.Resources>
+            <Image Source="/星火微课;component/Images/VideoList_OK.png"></Image>
+        </Button>
+        <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" HorizontalAlignment="Center" Margin="0,205,0,0" VerticalAlignment="Top" Height="30" Width="240" Foreground="#FF9A9A9A" FontSize="13" HorizontalContentAlignment="Center"/>
+        <Button x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left" Margin="25,248,0,0" VerticalAlignment="Top" Width="90" Height="34" Background="#FF3492F4" Foreground="White" FontSize="18" Click="BtnUpload_Click"/>
+        <Button x:Name="BtnDelVideo" Content="删除" HorizontalAlignment="Right" Margin="0,248,25,0" VerticalAlignment="Top" Width="90" Height="34" Foreground="White" FontSize="18" Background="#FFF0582C" Click="BtnDelVideo_Click"/>
+
+    </Grid>
+</UserControl>

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -0,0 +1,358 @@
+using Common.system;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+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.Navigation;
+using System.Windows.Shapes;
+using XHWK.Model;
+using XHWK.WKTool.DAL;
+
+namespace XHWK.WKTool.UControl
+{
+    /// <summary>
+    /// 视频信息
+    /// </summary>
+    public partial class Uc_VideoItem : UserControl
+    {
+        #region 初始值
+        /// <summary>
+        /// 视频模型
+        /// </summary>
+        Model_Video VideoModel = new Model_Video();
+        /// <summary>
+        /// 刷新视频列表
+        /// </summary>
+        public delegate void RefreshVideoList();
+        /// <summary>
+        /// 刷新视频列表事件
+        /// </summary>
+        public event RefreshVideoList Click_refreshVideoList;
+        /// <summary>
+        /// 登陆
+        /// </summary>
+        public delegate void UploadLogin();
+        /// <summary>
+        /// 登陆事件
+        /// </summary>
+        public event UploadLogin Click_UploadLogin;
+        /// <summary>
+        /// 上传页面
+        /// </summary>
+        UploadWindow W_UploadWindow = null;
+        /// <summary>
+        /// 是否正在
+        /// </summary>
+        bool IsUpLoad = false;
+        #endregion
+
+        #region 初始化
+        /// <summary>
+        /// 视频信息
+        /// </summary>
+        /// <param name="model_Video"></param>
+        public Uc_VideoItem(Model_Video model_Video)
+        {
+            InitializeComponent();
+            VideoModel = model_Video;
+            if (FileToolsCommon.IsExistFile(VideoModel.ThumbnailPath))
+            {
+                ImgVideo.Source = ImageHelper.ReadBitmapImageFile(VideoModel.ThumbnailPath);// new BitmapImage(new Uri(VideoModel.ThumbnailPath));
+            }
+            string videoName = FileToolsCommon.GetIOFileNameNoExtension(VideoModel.VideoPath);
+            TbName.Text = videoName.Length > 20 ? videoName.Substring(0, 20) + "..." : videoName;
+            TbName.ToolTip = videoName;
+            lblDateSize.Content = VideoModel.RSTime + "|" + VideoModel.VideoSize;
+            //if (VideoModel.IsUpload)
+            //{
+            //    BtnUpload.Visibility = Visibility.Hidden;
+            //}
+        }
+        #endregion
+
+        #region 修改视频名
+        /// <summary>
+        /// 双击修改视频名
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TextBlock_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if(e.ClickCount==2)
+            {
+                TxtModify.Text = TbName.Text;
+                TbName.Visibility = Visibility.Hidden;
+                TxtModify.Visibility = Visibility.Visible;
+                BtnNameModifyOK.Visibility = Visibility.Visible;
+            }
+        }
+        /// <summary>
+        /// 失去焦点保存视频名
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TxtModify_LostFocus(object sender, RoutedEventArgs e)
+        {
+            ModifyVideoName();
+        }
+
+        /// <summary>
+        /// Enter保存
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TxtModify_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.Enter)
+            {
+                ModifyVideoName();
+            }
+        }
+        /// <summary>
+        /// 修改文件名保存
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnNameModifyOK_Click(object sender, RoutedEventArgs e)
+        {
+            ModifyVideoName();
+        }
+        /// <summary>
+        /// 修改视频文件名
+        /// </summary>
+        void ModifyVideoName()
+        {
+            if (TxtModify.Text != TbName.Text)
+            {
+                string ErrMessage;
+                if (ModifyPathName(VideoModel.FileGuid, TxtModify.Text + "." + VideoModel.VideoType, out ErrMessage))
+                {
+                    //保存成功
+                    TbName.Text = TxtModify.Text.Length > 20 ? TxtModify.Text.Substring(0, 20) + "..." : TxtModify.Text;
+                    TbName.ToolTip = TxtModify.Text;
+                    TbName.Visibility = Visibility.Visible;
+                    TxtModify.Visibility = Visibility.Hidden;
+                    BtnNameModifyOK.Visibility = Visibility.Hidden;
+                }
+                else
+                {
+                    MessageWindow.Show(ErrMessage);
+                }
+            }
+            else
+            {
+                TbName.Visibility = Visibility.Visible;
+                TxtModify.Visibility = Visibility.Hidden;
+                BtnNameModifyOK.Visibility = Visibility.Hidden;
+            }
+        }
+        /// <summary>
+        /// 修改视频文件名
+        /// </summary>
+        /// <param name="Guid">唯一编号</param>
+        /// <param name="NewName">新文件名带后缀 不带路径</param>
+        /// <param name="Errmessage">错误信息</param>
+        /// <returns></returns>
+        private bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
+        {
+            Errmessage = "";
+            foreach (Model_WKData WKData in APP.WKDataList)
+            {
+                if (WKData.VideoList.Exists(x => x.FileGuid == FileGuid))
+                {
+
+                    Model_Video model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
+
+                    string filePathName = model_Video.VideoPath;
+                    string filePath = FileToolsCommon.GetDirectoryName(filePathName);
+                    string newFilePathName = filePath + NewName;
+                    //缩略图
+                    string ThumbnailPath = filePath + "ThumbnailPath/";
+                    FileToolsCommon.CreateDirectory(ThumbnailPath);
+                    //缩略图存储位置
+                    string ThumbnailPathName = ThumbnailPath + NewName.Replace(".", "") + ".JPG";
+                    if (FileToolsCommon.IsExistFile(newFilePathName))
+                    {
+                        Errmessage = "文件已存在，请重新修改文件名！";
+                        return false;
+                    }
+                    else
+                    {
+                        //修改文件名
+                        FileToolsCommon.Copy(filePathName, newFilePathName);
+                        model_Video.VideoPath = newFilePathName;
+                        //修改缩略图名
+                        FileToolsCommon.DeleteFile(ThumbnailPathName);
+                        FileToolsCommon.Copy(model_Video.ThumbnailPath, ThumbnailPathName);
+                        model_Video.ThumbnailPath = ThumbnailPathName;
+                        APP.SaveWkData();
+                        return true;
+                    }
+                }
+                else
+                {
+                    continue;
+                }
+            }
+            Errmessage = "视频文件有改动，当前文件不存在，请关闭后重新打开“我的”";
+            return false;
+        }
+
+        #endregion
+
+        #region 删除视频
+        /// <summary>
+        /// 删除视频
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnDelVideo_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBoxResult dr = MessageWindow.Show("确定删除该视频？", "提示", MessageBoxButton.OKCancel);
+            if (dr == MessageBoxResult.OK)
+            {
+                foreach (Model_WKData wKData in APP.WKDataList)
+                {
+                    if (wKData.VideoList == null)
+                    {
+                        continue;
+                    }
+                    if (wKData.VideoList.Exists(x => x.FileGuid == VideoModel.FileGuid))
+                    {
+                        try
+                        {
+                            FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == VideoModel.FileGuid).VideoPath);
+                            string ThumbnailPath = wKData.VideoList.Find(x => x.FileGuid == VideoModel.FileGuid).ThumbnailPath;
+                            wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == VideoModel.FileGuid));
+                            //初始化页面  刷新视频列表
+                            Click_refreshVideoList();
+                            ImgVideo.Source = null;
+                            GC.Collect();
+                            FileToolsCommon.DeleteFile(ThumbnailPath);
+                            return;
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageWindow.Show("无法删除视频！" + ex.Message);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 播放视频
+
+        private void BtnVideoPlay_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                ProcessStartInfo psi = new ProcessStartInfo(VideoModel.VideoPath);
+                Process pro = new Process
+                {
+                    StartInfo = psi
+                };
+                pro.Start();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
+                System.Windows.MessageBox.Show(ex.Message);
+                return;
+            }
+        }
+        /// <summary>
+        /// 视频播放
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Image_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                ProcessStartInfo psi = new ProcessStartInfo(VideoModel.VideoPath);
+                Process pro = new Process
+                {
+                    StartInfo = psi
+                };
+                pro.Start();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
+                System.Windows.MessageBox.Show(ex.Message);
+                return;
+            }
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 视频上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnUpload_Click(object sender, RoutedEventArgs e)
+        {
+            if (APP.IsLoginType == false)
+            {
+                //登陆
+                Click_UploadLogin();
+                return;
+            }
+            if (!IsUpLoad)
+            {
+                IsUpLoad = true;
+                BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                DAL_Upload dAL_Upload = new DAL_Upload();
+
+                if (dAL_Upload.UploadVideo(VideoModel.FileGuid, out string ErrMessage))
+                {
+                    //MessageWindow.Show("视频上传服务器成功！");
+                    if (W_UploadWindow == null)
+                    {
+                        W_UploadWindow = new UploadWindow
+                        {
+                            Owner = APP.W_XHMicroLessonSystemWindow
+                        };
+                        W_UploadWindow.ChangeTextEvents += frm_ChangeTextEvents; ;
+                    }
+
+                    //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
+                    W_UploadWindow.Initialize(TbName.Text, VideoModel.VideoSizebyte, VideoModel.VideoType.ToString(), VideoModel.FileGuid, 0);
+                    W_UploadWindow.ShowDialog();
+                }
+                else
+                {
+                    IsUpLoad = false;
+                    BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#3491F4"));
+                    MessageWindow.Show(ErrMessage);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 上传返回事件
+        /// </summary>
+        /// <param name="text"></param>
+        private void frm_ChangeTextEvents(string text, int i)
+        {
+            if ("上传成功".Equals(text))
+            {
+                W_UploadWindow.Close();
+                BtnUpload.Visibility = Visibility.Hidden;
+            }
+        }
+
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -156,141 +156,141 @@
     </Window.BorderBrush>
 
     <Viewbox>
-    <Grid x:Name="GridContent" Height="1030" Width="1276">
-        <!--分3行-->
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="auto"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px" MouseDown="Grid_MouseDown">
+        <Grid x:Name="GridContent" Height="1030" Width="1276">
+            <!--分3行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
+                <RowDefinition Height="*"/>
                 <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
-            <!--第一行-->
-            <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,2,10,0">
-                <Image Source="./Images/microLessonSystem_0.png"/>
-                <TextBlock Text="星火微课系统" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
-            </StackPanel>
-
-            <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,20,0">
-                <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
-                    <StackPanel Orientation="Horizontal">
-                        <Image Source="./Images/microLessonSystem_9.png"/>
-                        <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"
+            <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px" MouseDown="Grid_MouseDown">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                </Grid.RowDefinitions>
+                <!--第一行-->
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,2,10,0">
+                    <Image Source="./Images/microLessonSystem_0.png"/>
+                    <TextBlock Text="星火微课系统" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
+                </StackPanel>
+
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,20,0">
+                    <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
+                        <StackPanel Orientation="Horizontal">
+                            <Image Source="./Images/microLessonSystem_9.png"/>
+                            <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"
                                    />
-                    </StackPanel>
-                </Button>
-                <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="8,0,8,0">
-                    <Image Source="./Images/microLessonSystem_19.png"/>
-                </Button>
-                <!--<Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="8,0,8,0">
+                        <Image Source="./Images/microLessonSystem_19.png"/>
+                    </Button>
+                    <!--<Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
                         <Image Source="./Images/microLessonSystem_8.png"/>
                     </Button>-->
-                <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click" >
-                    <Image Source="./Images/microLessonSystem_10.png"/>
-                </Button>
-            </StackPanel>
+                    <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click" >
+                        <Image Source="./Images/microLessonSystem_10.png"/>
+                    </Button>
+                </StackPanel>
 
 
-            <!--第二行-->
+                <!--第二行-->
 
-            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0,0,5" HorizontalAlignment="Left">
-                <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
-                        <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
-                        <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-                <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnScreenshot_Click">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgScreenshot" Source="./Images/microLessonSystem_12.png"/>
-                        <Image x:Name="ImgScreenshotTwo" Source="./Images/microLessonSystem_11.png" Visibility="Collapsed"/>
-                        <TextBlock Text="截图" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-                <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click" Margin="30,0,0,0">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgImport" Source="./Images/microLessonSystem_6.png"/>
-                        <Image x:Name="ImgImportTwo" Source="./Images/microLessonSystem_7.png" Visibility="Collapsed"/>
-                        <TextBlock Text="导入" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-                <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="100,0,0,0" Click="BtnRecord_Click">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
-                        <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
-                        <TextBlock x:Name="TxbRecordingWord" Text="录制" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-                <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click" Margin="30,0,0,0">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgStop" Source="./Images/microLessonSystem_21.png"/>
-                        <Image x:Name="ImgStopTwo" Source="./Images/microLessonSystem_20.png" Visibility="Collapsed"/>
-                        <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-                <TextBlock x:Name="txbTime" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
-            </StackPanel>
-            <StackPanel Grid.Row="1" HorizontalAlignment="Center">
-                <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="0,25,0,0"/>
-            </StackPanel>
-            <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,5">
-                <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
-                        <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
-                        <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-                <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnPrint_Click">
-                    <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgPrint" Source="./Images/microLessonSystem_4.png" Visibility="Collapsed"/>
-                        <Image x:Name="ImgPrintTwo" Source="./Images/microLessonSystem_5.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}}" Click="BtnUpload_Click" Margin="0,0,30,0">
+                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0,0,5" HorizontalAlignment="Left">
+                    <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
+                            <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
+                            <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnScreenshot_Click">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgScreenshot" Source="./Images/microLessonSystem_12.png"/>
+                            <Image x:Name="ImgScreenshotTwo" Source="./Images/microLessonSystem_11.png" Visibility="Collapsed"/>
+                            <TextBlock Text="截图" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click" Margin="30,0,0,0">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgImport" Source="./Images/microLessonSystem_6.png"/>
+                            <Image x:Name="ImgImportTwo" Source="./Images/microLessonSystem_7.png" Visibility="Collapsed"/>
+                            <TextBlock Text="导入" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="100,0,0,0" Click="BtnRecord_Click">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
+                            <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
+                            <TextBlock x:Name="TxbRecordingWord" Text="录制" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click" Margin="30,0,0,0">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgStop" Source="./Images/microLessonSystem_21.png"/>
+                            <Image x:Name="ImgStopTwo" Source="./Images/microLessonSystem_20.png" Visibility="Collapsed"/>
+                            <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <TextBlock x:Name="txbTime" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="1" HorizontalAlignment="Center">
+                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="0,25,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,5">
+                    <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
+                            <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
+                            <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnPrint_Click">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgPrint" Source="./Images/microLessonSystem_4.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgPrintTwo" Source="./Images/microLessonSystem_5.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}}" 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="Visible"/>
-                        <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Collapsed"/>
-                        <TextBlock Text="我的" FontSize="14" Padding="0,6,0,0" 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">
-                        <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>
-                        <Image x:Name="ImgSetUpTwo" Source="./Images/microLessonSystem_17.png" Visibility="Collapsed"/>
-                        <TextBlock Text="设置" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                    <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="Visible"/>
+                            <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Collapsed"/>
+                            <TextBlock Text="我的" FontSize="14" Padding="0,6,0,0" 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">
+                            <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>
+                            <Image x:Name="ImgSetUpTwo" Source="./Images/microLessonSystem_17.png" Visibility="Collapsed"/>
+                            <TextBlock Text="设置" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
             </Grid>
 
-        <!--主内容-->
-        <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">
-            <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"
+            <!--主内容-->
+            <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">
+                <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"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
                                             <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
@@ -298,100 +298,100 @@
                              MouseWheel="IMG1_MouseWheel" >
                                             </ContentControl>
                                         </ScrollViewer>-->
-                                <!--图片表框 -->
-                                <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
-                                <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
-                                <!--四个点 -->
-                                <Canvas>
-                                    <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                    <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                    <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                    <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                </Canvas>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
+                                    <!--图片表框 -->
+                                    <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
+                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
+                                    <!--四个点 -->
+                                    <Canvas>
+                                        <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                        <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                        <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                        <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                    </Canvas>
+                                </Grid>
+                            </Border>
+                        </Grid>
+                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
 
-                    <!--导入图片-->
-                    <!--<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" />
+                        <!--导入图片-->
+                        <!--<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">
+                        <!--摄像头-->
+                        <!--<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>-->
-                    <!--<Image x:Name="imgLoad"
+                        <!--<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"/>
-            <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
-        </Grid>
-        <!--页码-->
-        <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
-            <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
+                    </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"/>
+                <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
+            </Grid>
+            <!--页码-->
+            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" 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}}"
+                    <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"
                     Width="60" Height="20"
                     Click="last_button_Click">
-                    <Button.Content>
-                        <StackPanel>
-                            <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                        </StackPanel>
-                    </Button.Content>
-                </Button>
-                <Grid Width="60"  Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="311*"/>
-                        <RowDefinition Height="483*"/>
-                    </Grid.RowDefinitions>
-                    <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"/>
-                            <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
+                        <Button.Content>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                            </StackPanel>
+                        </Button.Content>
+                    </Button>
+                    <Grid Width="60"  Background="Transparent">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="311*"/>
+                            <RowDefinition Height="483*"/>
+                        </Grid.RowDefinitions>
+                        <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"/>
+                                <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </Grid>
-                <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    </Grid>
+                    <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="next_btn"  Background="Transparent"
                     Width="60" Height="20"
                     Click="next_btn_Click">
-                    <Button.Content>
-                        <StackPanel>
-                            <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                        </StackPanel>
-                    </Button.Content>
-                </Button>
-            </StackPanel>
-        </Grid>
-        <!--设置-->
-        <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="90"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="50"/>
-                <RowDefinition Height="60"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
+                        <Button.Content>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                            </StackPanel>
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <!--设置-->
+            <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="90"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="50"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition Width="*"/>
@@ -403,154 +403,154 @@
                 <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                     <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
-                <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0" Visibility="Collapsed"/>
-            </StackPanel>
+                    <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                    <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0" Visibility="Collapsed"/>
+                </StackPanel>
 
                 <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                     <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
-                <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
-                <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-            </StackPanel>
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
-                <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
-                <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-            </StackPanel>
-
-
-            <!--接口地址-->
+                    <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
+                    <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
+                    <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
+                    <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
+                    <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                </StackPanel>
+
+
+                <!--接口地址-->
                 <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,20,0,0"/>
                 <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
                     <TextBlock Text="http://" FontSize="16" Padding="0,20,5,0"/>
-                <TextBox x:Name="txbInterfaceAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-            </StackPanel>
-            
-            <!--上传地址-->
+                    <TextBox x:Name="txbInterfaceAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                </StackPanel>
+
+                <!--上传地址-->
                 <TextBlock Grid.Row="4" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
                 <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
                     <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
-                <TextBox x:Name="txbImageUploadAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-            </StackPanel>
-            
-            <!--下载地址-->
+                    <TextBox x:Name="txbImageUploadAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                </StackPanel>
+
+                <!--下载地址-->
                 <TextBlock Grid.Row="5" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
                 <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
                     <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
-                <TextBox x:Name="txbPictureShowsAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-            </StackPanel>
+                    <TextBox x:Name="txbPictureShowsAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                </StackPanel>
 
                 <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Padding="0,35,0,0" />
                 <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,20,0,0">
                     <Border Background="#CDD6E0" Width="522" Height="43" CornerRadius="3" Margin="0,0,0,0">
-                    <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="10,12,2,2" Width="520" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
-                </Border>
-                <!--浏览按钮-->
-                <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
+                        <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="10,12,2,2" Width="520" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+                    </Border>
+                    <!--浏览按钮-->
+                    <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                <Border.Background>#EBEFF3</Border.Background>
-                                <ContentPresenter
+                                    <Border.Background>#EBEFF3</Border.Background>
+                                    <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
-                </Button>
-            </StackPanel>
+                                </Border>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </StackPanel>
 
                 <TextBlock Grid.Row="7" Grid.Column="0" Text="版本号" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
                 <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
                     <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
-            </StackPanel>
+                </StackPanel>
 
                 <TextBlock Grid.Row="8" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
                 <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
                     <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
-            </StackPanel>
+                </StackPanel>
 
                 <TextBlock Grid.Row="9" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
                 <StackPanel Grid.Row="9" Grid.Column="1">
                     <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,30,0,0"/>
                 </StackPanel>
                 <!--第四行 开始按钮-->
-            <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
-                <Button.Template>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border
+                <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                            <Border.Background>#2D8CF0</Border.Background>
-                            <ContentPresenter
+                                <Border.Background>#2D8CF0</Border.Background>
+                                <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                        </Border>
-                    </ControlTemplate>
-                </Button.Template>
-            </Button>
-        </Grid>
-        <!--上传-->
-        <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Hidden">
-            <Border Background="#EFF1F8">
-                <Grid Background="#FFFFFF" Margin="0,0,0,0">
-                    <!--分4行-->
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="30"/>
-                    </Grid.RowDefinitions>
-                    <!--第二行 内容-->
-                    <Grid Grid.Row="0" Margin="0,0,0,0">
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+            </Grid>
+            <!--上传-->
+            <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Hidden">
+                <Border Background="#EFF1F8">
+                    <Grid Background="#FFFFFF" Margin="0,0,0,0">
+                        <!--分4行-->
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="45"/>
                             <RowDefinition Height="*"/>
+                            <RowDefinition Height="30"/>
                         </Grid.RowDefinitions>
-                        <UniformGrid x:Name="uniStatisticsByTitle"
+                        <!--第二行 内容-->
+                        <Grid Grid.Row="0" Margin="0,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="45"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <UniformGrid x:Name="uniStatisticsByTitle"
                 Grid.Row="0"
                 Margin="0,0,0,0"
                 Background="#E6F0FF"
                 Columns="5"
                 Rows="1">
-                            <TextBlock
+                                <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="序号"  />
-                            <TextBlock
+                                <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="视频名称"/>
-                            <!--<TextBlock
+                                <!--<TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
                     Text="视频时长" Foreground="White" />-->
-                            <TextBlock
+                                <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="视频大小"/>
-                            <TextBlock
+                                <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="日期"/>
-                            <TextBlock
+                                <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="操作"/>
-                        </UniformGrid>
-                        <ListBox Grid.Row="1" Margin="0,0,0,0"
+                            </UniformGrid>
+                            <ListBox Grid.Row="1" Margin="0,0,0,0"
                     x:Name="listView1"
                     BorderThickness="0"
                     FontSize="20"
@@ -559,100 +559,112 @@
                     ItemsSource="{Binding menuList}" 
                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
-                    </Grid>
-                    <StackPanel Grid.Row="3" x:Name="stpUp" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
+                        </Grid>
+                        <StackPanel Grid.Row="3" x:Name="stpUp" Orientation="Horizontal" Background="Transparent" 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}}"
+                            <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="btnLastPage"
                     Width="60" Height="20"
                     Click="BtnLastPage_Click">
-                            <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                                </StackPanel>
-                            </Button.Content>
-                        </Button>
-                        <Grid Width="60"  Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="311*"/>
-                                <RowDefinition Height="483*"/>
-                            </Grid.RowDefinitions>
-                            <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="txbCurrpageTwo" TextAlignment="Center" FontSize="15"/>
-                                    <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
-                                    <TextBlock x:Name="txbPageNumTwo" TextAlignment="Center" FontSize="15"/>
+                                <Button.Content>
+                                    <StackPanel>
+                                        <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                    </StackPanel>
+                                </Button.Content>
+                            </Button>
+                            <Grid Width="60"  Background="Transparent">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="311*"/>
+                                    <RowDefinition Height="483*"/>
+                                </Grid.RowDefinitions>
+                                <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="txbCurrpageTwo" TextAlignment="Center" FontSize="15"/>
+                                        <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
+                                        <TextBlock x:Name="txbPageNumTwo" TextAlignment="Center" FontSize="15"/>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                        </Grid>
-                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            </Grid>
+                            <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="btnNextPage"  Background="Transparent"
                     Width="60" Height="20"
                     Click="BtnNextPage_Click">
-                            <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                                </StackPanel>
-                            </Button.Content>
-                        </Button>
-                    </StackPanel>
+                                <Button.Content>
+                                    <StackPanel>
+                                        <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                    </StackPanel>
+                                </Button.Content>
+                            </Button>
+                        </StackPanel>
 
-                </Grid>
-            </Border>
-        </Grid>
-        <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,5,0,0"/>
-                <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
+                    </Grid>
+                </Border>
+            </Grid>
+
+            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Hidden">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="50"/>
+                </Grid.RowDefinitions>
+                <Label x:Name="lblVideoMess" Grid.Row="0" Content="暂无微课录制信息，请录制并等待保存完成后重试！" HorizontalAlignment="Center" Margin="0,0,0,100" VerticalAlignment="Center" FontSize="20" Visibility="Hidden"/>
+                <Button x:Name="BtnVideoUpPage" Content="上一页" HorizontalAlignment="Center" Margin="0,0,150,10" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoUpPage_Click"/>
+                <Label x:Name="lblVideoPageNum" Grid.Row="1" FontSize="14" Content="100/100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Foreground="#FF333333" />
+                <Button x:Name="BtnVideoDownPage" Content="下一页" HorizontalAlignment="Center" Margin="150,0,0,10" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoDownPage_Click"/>
+            </Grid>
+
+            <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,5,0,0"/>
+                    <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
                         <Button Cursor="Hand" x:Name="btnRed" Width="20" Height="20" Background="#FF0000" Margin="1,1,1,1" HorizontalAlignment="Center"  Click="BtnRed_Click" Style="{StaticResource NoMouseOverButtonStyle}">
-                    <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
-                </Button>
+                            <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
+                        </Button>
                     </Border>
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
                         <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="1,1,1,1" Click="BtnGray_Click" Style="{StaticResource NoMouseOverButtonStyle}">
-                    <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                </Button>
+                            <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
                     </Border>
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
 
 
                         <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="1,1,1,1" Click="BtnCyanBlue_Click" Style="{StaticResource NoMouseOverButtonStyle}">
-                    <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                </Button>
+                            <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
                     </Border>
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
 
 
                         <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="1,1,1,1" Click="BtnYellow_Click" Style="{StaticResource NoMouseOverButtonStyle}">
-                   
-                    <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                </Button>
+
+                            <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
                     </Border>
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
 
 
                         <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="1,1,1,1" Click="BtnBlue_Click" Style="{StaticResource NoMouseOverButtonStyle}">
-                    <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                </Button>
+                            <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
                     </Border>
                     <TextBlock Text="粗细：" FontSize="14" Padding="15,0,0,0" Margin="5,5,0,0"/>
                     <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,7,0,0" IsChecked="True" Click="RbnFine_Click"/>
-                <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,7,0,0" Click="RbnIn_Click"/>
-                <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,7,0,0" Click="RbnCrude_Click"/>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="摄像头：" FontSize="14" Padding="15,6,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,7,0,0" Click="RbnOpen_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,7,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,7,0,0" Click="RbnIn_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,7,0,0" Click="RbnCrude_Click"/>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="摄像头：" FontSize="14" Padding="15,6,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,7,0,0" Click="RbnOpen_Click"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,7,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
+                    </StackPanel>
                 </StackPanel>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
-                <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
-                <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
-            </StackPanel>
-        </Grid>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
+                    <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
+                    <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
+                </StackPanel>
+            </Grid>
 
-    </Grid>
+        </Grid>
     </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -29,7 +29,7 @@ using TStudyDigitalPen.HID;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
-
+using XHWK.WKTool.UControl;
 
 namespace XHWK.WKTool
 {
@@ -1633,7 +1633,7 @@ namespace XHWK.WKTool
         }
         #endregion
 
-        #region 上传
+        #region 上传 列表
         /// <summary>
         /// 上传事件
         /// </summary>
@@ -1641,18 +1641,34 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUpload_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.IsLoginType == false)
-            {
-                Login();
-                return;
-            }
-            if (gridUpload.Visibility == Visibility.Visible)
+            //if (gridUpload.Visibility == Visibility.Visible)
+            //{
+            //    gridUpload.Visibility = Visibility.Collapsed;
+            //    GridMain.Visibility = Visibility.Visible;
+            //    //ImgRecord.Visibility = Visibility.Visible;//上传结束时可录制
+            //    //ImgRecordTwo.Visibility = Visibility.Collapsed;//上传结束时可录制
+            //    //BtnRecord.IsEnabled = true;//设置结束时可录制
+            //    if (APP.pageData.pagenum > 0)
+            //    {
+            //        gridPage.Visibility = Visibility.Visible;
+            //    }
+            //    DataContext = APP.pageData;
+            //}
+            //else
+            //{
+            //    gridPage.Visibility = Visibility.Collapsed;
+            //    gridUpload.Visibility = Visibility.Visible;
+            //    GridMain.Visibility = Visibility.Collapsed;
+            //    //ImgRecord.Visibility = Visibility.Collapsed;//上传时不可录制
+            //    //ImgRecordTwo.Visibility = Visibility.Visible;//上传时不可录制
+            //    //BtnRecord.IsEnabled = false;//上传时不可录制
+            //    InitializeUpload();
+            //}
+
+            if (GridMyVideo.Visibility == Visibility.Visible)
             {
-                gridUpload.Visibility = Visibility.Collapsed;
+                GridMyVideo.Visibility = Visibility.Collapsed;
                 GridMain.Visibility = Visibility.Visible;
-                //ImgRecord.Visibility = Visibility.Visible;//上传结束时可录制
-                //ImgRecordTwo.Visibility = Visibility.Collapsed;//上传结束时可录制
-                //BtnRecord.IsEnabled = true;//设置结束时可录制
                 if (APP.pageData.pagenum > 0)
                 {
                     gridPage.Visibility = Visibility.Visible;
@@ -1662,12 +1678,9 @@ namespace XHWK.WKTool
             else
             {
                 gridPage.Visibility = Visibility.Collapsed;
-                gridUpload.Visibility = Visibility.Visible;
+                GridMyVideo.Visibility = Visibility.Visible;
                 GridMain.Visibility = Visibility.Collapsed;
-                //ImgRecord.Visibility = Visibility.Collapsed;//上传时不可录制
-                //ImgRecordTwo.Visibility = Visibility.Visible;//上传时不可录制
-                //BtnRecord.IsEnabled = false;//上传时不可录制
-                InitializeUpload();
+                LoadUploadInitData();
             }
             //btnStop.IsEnabled = true;//停止录制按钮可点击
         }
@@ -1845,6 +1858,11 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUploads_Click(object sender, RoutedEventArgs e)
         {
+            if (APP.IsLoginType == false)
+            {
+                Login();
+                return;
+            }
             pageData.menuList[Subscript].IsEnabled = false;
             List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnUpload");
             for (int i = 0; i < buttons.Count; i++)
@@ -2267,7 +2285,162 @@ namespace XHWK.WKTool
         }
 
         #endregion
+        #region 新上传 显示缩略图
+        #region 初始值
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        int TotalPage=0;
+        /// <summary>
+        /// 当前页
+        /// </summary>
+        int CurrentPage = 1;
+        /// <summary>
+        /// 每页显示的视频数
+        /// </summary>
+        int PageShowNum = 0;
+        /// <summary>
+        /// 视频信息列表
+        /// </summary>
+        List<Uc_VideoItem> VideoControlList = new List<Uc_VideoItem>();
+        /// <summary>
+        /// 横向间隔
+        /// </summary>
+        double IntervalX = 0;
+        /// <summary>
+        /// 纵向间隔
+        /// </summary>
+        double IntervalY = 0;
+        #endregion
+        /// <summary>
+        /// 初始化加载上传页面数据
+        /// </summary>
+        void LoadUploadInitData()
+        {
+            APP.myloading.Show();
+            //加载视频列表
+            LoadingVideoList();
+            if (model_VideoList.Count > 0)
+            {
+                lblVideoMess.Visibility = Visibility.Hidden;
+                BtnVideoUpPage.Visibility = Visibility.Visible;
+                lblVideoPageNum.Visibility = Visibility.Visible;
+                BtnVideoDownPage.Visibility = Visibility.Visible;
+                //根据页面大小获取每页显示的数量 H300W250
+                int videoRow = (int)((GridMyVideo.ActualHeight - 50) / 300);
+                int videColumn = (int)(GridMyVideo.ActualWidth / 250);
+                PageShowNum = videoRow * videColumn;
+                //获取总页数
+                TotalPage = model_VideoList.Count / PageShowNum + (model_VideoList.Count % PageShowNum > 0 ? 1 : 0);
+                //如果当前页大于总页数 总页数为当前页
+                if (TotalPage < CurrentPage)
+                {
+                    CurrentPage = TotalPage;
+                }
+                //横向间隔
+                IntervalX = (GridMyVideo.ActualWidth - (videColumn * 250)) / (videColumn + 1);
+                IntervalY = (GridMyVideo.ActualHeight - 50 - (videoRow * 300)) / (videoRow + 1);
+                LoadCurrentPageData();
+            }
+            else
+            {
+                lblVideoMess.Visibility = Visibility.Visible;
+                BtnVideoUpPage.Visibility = Visibility.Hidden;
+                lblVideoPageNum.Visibility = Visibility.Hidden;
+                BtnVideoDownPage.Visibility = Visibility.Hidden;
+            }
+            APP.myloading.Hide();
+        }
+        /// <summary>
+        /// 加载当前页数据
+        /// </summary>
+        private void LoadCurrentPageData()
+        {
+            lblVideoPageNum.Content = CurrentPage + "/" + TotalPage;
+            //隐藏显示的控件
+            if(VideoControlList.Count>0)
+            {
+                foreach(Uc_VideoItem item in VideoControlList)
+                {
+                    if (item.Visibility != Visibility.Hidden)
+                    {
+                        item.Visibility = Visibility.Hidden;
+                    }
+                }
+            }
+            double W = IntervalX;//每次增加250
+            double H = IntervalY;//每次增加300
+            //加载控件
+            for(int i=0;i< PageShowNum;i++)
+            {
+                int DataIndex = (CurrentPage - 1) * PageShowNum + i;
+                if(DataIndex== model_VideoList.Count)
+                {
+                    return;
+                }
+                Uc_VideoItem videoItem;
+                if (VideoControlList.Exists(x => x.Tag.ToString() == model_VideoList[DataIndex].FileGuid))
+                {
+                    videoItem = VideoControlList.Find(x => x.Tag.ToString() == model_VideoList[DataIndex].FileGuid);
+                }
+                else
+                {
+                    videoItem = new Uc_VideoItem(model_VideoList[DataIndex]);
+                    videoItem.Tag = model_VideoList[DataIndex].FileGuid;
+                    videoItem.Click_refreshVideoList += LoadUploadInitData;
+                    videoItem.Click_UploadLogin += Login;
+                    videoItem.Width = 250;
+                    videoItem.Height = 300;
+                    videoItem.HorizontalAlignment = System.Windows.HorizontalAlignment.Left;
+                    videoItem.VerticalAlignment = System.Windows.VerticalAlignment.Top;
+                    GridMyVideo.Children.Add(videoItem);
+                    VideoControlList.Add(videoItem);
+                }
+                videoItem.Margin = new Thickness(W, H, 0, 0);
+                videoItem.Visibility = Visibility.Visible;
+                if (W + 250+250>GridMyVideo.ActualWidth)
+                {
+                    W = IntervalX;
+                    H += 300+ IntervalY;
+                }
+                else
+                {
+                    W += 250+ IntervalX;
+                }
+                //Uc_VideoItem videoItem = new Uc_VideoItem();
+                //return;
+            }
+        }
 
+        #region 分页
+        /// <summary>
+        /// 上一页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnVideoUpPage_Click(object sender, RoutedEventArgs e)
+        {
+            if(CurrentPage>1)
+            {
+                CurrentPage--;
+                LoadCurrentPageData();
+            }
+        }
+        /// <summary>
+        /// 下一页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnVideoDownPage_Click(object sender, RoutedEventArgs e)
+        {
+            if (CurrentPage < TotalPage)
+            {
+                CurrentPage++;
+                LoadCurrentPageData();
+            }
+        }
+        #endregion
+        #endregion
         #region 录制窗口
         #region 变量
         /// <summary>
@@ -2970,7 +3143,7 @@ namespace XHWK.WKTool
                         VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
                         //生成缩略图
-                        bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName);
+                        bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName,200,130);
                         Thread.Sleep(500);
                         int imgW = (int)GridMain.ActualWidth + (GridMain.ActualWidth % 2 > 0 ? 1 : 0);
                         int imgH = (int)GridMain.ActualHeight + (GridMain.ActualHeight % 2 > 0 ? 1 : 0);
@@ -3043,15 +3216,15 @@ namespace XHWK.WKTool
             {
                 txbLoginType.Text = APP.UserInfo.Username;
 
-                ImgUpload.Visibility = Visibility.Visible;
-                ImgUploadTwo.Visibility = Visibility.Collapsed;
+                //ImgUpload.Visibility = Visibility.Visible;
+                //ImgUploadTwo.Visibility = Visibility.Collapsed;
             }
             else
             {
                 txbLoginType.Text = "未登录";
 
-                ImgUpload.Visibility = Visibility.Collapsed;
-                ImgUploadTwo.Visibility = Visibility.Visible;
+                //ImgUpload.Visibility = Visibility.Collapsed;
+                //ImgUploadTwo.Visibility = Visibility.Visible;
             }
         }
         /// <summary>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -181,6 +181,9 @@
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UControl\Uc_VideoItem.xaml.cs">
+      <DependentUpon>Uc_VideoItem.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UploadWindow.xaml.cs">
       <DependentUpon>UploadWindow.xaml</DependentUpon>
     </Compile>
@@ -240,6 +243,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="UControl\Uc_VideoItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UploadWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1595,5 +1602,11 @@
   <ItemGroup>
     <Resource Include="Images\rollCall_1.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\VideoList_Play.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\VideoList_OK.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>