zhao：解决冲突

Common/system/BlackboardNew.cs

@@ -111,6 +111,14 @@ namespace Common.system
         {
             if (step != null)
             {
+                if (pagenum + 1 > strokes_page_all.Count)
+                {
+                    ZBBPage pagetemp = new ZBBPage();
+                    pagetemp.lines.Add(new ZBBPageStep());
+                    strokes_page_all.Add(pagetemp);
+                }
+
+
                 ZBBPage page = strokes_page_all[pagenum];
                 if (page != null)
                 {

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -132,11 +132,15 @@ namespace XHWK.WKTool
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
             APP.W_XHMicroLessonSystemWindow.Show();
             this.Hide();
         }
+        double screeHeight = SystemParameters.FullPrimaryScreenHeight;
+
+        double screeWidth = SystemParameters.FullPrimaryScreenWidth;
         /// <summary>
         /// 窗体移动
         /// </summary>

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -152,6 +152,54 @@ namespace XHWK.WKTool.DAL
                     return false;
                 }
                 else
+                {
+                    return true;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【视频上传】（UploadVideo）视频上传失败：" + ex.Message, ex);
+            }
+            return false;
+        }
+        /// <summary>
+        /// 上传视频
+        /// </summary>
+        /// <returns></returns>
+        public bool UploadVideoTwo(string VideoGuid, out string ErrMessage) 
+        {
+            ErrMessage = "";
+            try
+            {
+                Model_Video VideoInfo = null;
+                foreach (Model_WKData Vdata in APP.WKDataList)
+                {
+                    if (Vdata.VideoList == null)
+                        continue;
+                    foreach (Model_Video videoinfo in Vdata.VideoList)
+                    {
+                        if (videoinfo.FileGuid == VideoGuid)
+                        {
+                            VideoInfo = videoinfo;
+                            break;
+                        }
+                    }
+                    if (VideoInfo != null)
+                        break;
+                }
+                if (VideoInfo == null)
+                {
+                    ErrMessage = "未找到课程！";
+                    return false;
+                }
+                string UploadUrl = FileRequestAddress /*"http://192.168.2.18:8908" */+ "/chunkdb/upchunk";//zxyceshi
+                if (VideoInfo.IsUpload)
+                {
+                    ErrMessage = "视频已上传";
+                    return false;
+                }
+                else
                 {
                     if (string.IsNullOrWhiteSpace(VideoInfo.FileMD5))
                     {

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -234,7 +234,8 @@ namespace ComeCapture
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
 
             //BitmapSource bitmap = ImageHelper.GetBitmapSource((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2, out JieTuBitmapPtr);
-           /* BitmapImage bitmap = */ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath,true,out BitmapImage bitmapimg);
+           /* BitmapImage bitmap = */
+            ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath,true,out BitmapImage bitmapimg);
             _IsMouseDown = false;
             _IsCapture = false;
             ImageEditBar.Current.Visibility = Visibility.Collapsed;
@@ -242,8 +243,8 @@ namespace ComeCapture
             SizeRGB.Visibility = Visibility.Collapsed;
             MainImage.Visibility = Visibility.Collapsed;
             DataContext = new AppModel();
-            ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);//zxy
-            Background = new ImageBrush(bitmap);
+            //ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);//zxy
+            //Background = new ImageBrush(bitmap);
             WpfHelper.MainDispatcher = Dispatcher;
             MaxWindow();
             MaskLeft.Height = ScreenHeight;

XHWK.WKTool/PrintWindow.xaml.cs

@@ -85,13 +85,13 @@ namespace XHWK.WKTool
             LatticeFileHelper.GeneratingPDF(pdf, tpf, out pr, out msg, out outPut/*, pyte*/);
             if (pr == 0)
             {
-                outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
-                APP.OutPut = outPut.Split(',');
-                string []page= outPut.Split(',');
-                for(int i=0;i<page.Length;i++) //增加页码编号
-                {
-                    APP.PageDrawList[i].PageCode = page[i];
-                }
+                //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
+                //APP.OutPut = outPut.Split(',');
+                //string []page= outPut.Split(',');
+                //for(int i=0;i<page.Length;i++) //增加页码编号
+                //{
+                //    APP.PageDrawList[i].PageCode = page[i];
+                //}
               
                 //string defa = string.Empty;
                 //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,4 +1,5 @@
-using Common.system;
+using Aspose.Pdf.Text;
+using Common.system;
 
 using System;
 using System.Configuration;
@@ -62,6 +63,7 @@ namespace XHWK.WKTool
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
         /// </summary>
        public int flg = 0;
+        System.Timers.Timer timer = new System.Timers.Timer();
         #endregion
 
         #region 初始化
@@ -77,6 +79,11 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            //timer = new System.Timers.Timer(200);
+            //timer.Interval = 300;
+            //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
+            //timer.Enabled = true; //启动计时器
+
             k_hook = new KeyboardHookCommon();
             k_hook.KeyDownEvent += K_hook_KeyDownEvent;
 
@@ -115,7 +122,32 @@ namespace XHWK.WKTool
             //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
             //BtnRecordingScreen_Click(null, null);
         }
+        void TimerDealy(object o, EventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                if (this.Left > 1630)
+                {
+                    return;
+                }
+                //获取鼠标在屏幕上的位置
+                double mouse_x = Form.MousePosition.X;   //需要添加引用System.Drawing
+                double mouse_y = Form.MousePosition.Y;
+
+                bool is_in_collasped_range = (mouse_y > this.Left + this.Height) || (mouse_x < this.Left || mouse_x > this.Left + this.Width);//缩起的条件
+                bool is_in_visiable_range = (mouse_y < 1 && mouse_x >= this.Left && mouse_x <= this.Left + this.Width); //展开的条件         
 
+                if (this.Left < 1630 && this.Left >= 0 && is_in_collasped_range)
+                {
+                    System.Threading.Thread.Sleep(300);
+                    this.Left +=20 /*-this.ActualWidth - 3*/;
+                }
+                else if (this.Left < 0 && is_in_visiable_range)
+                {
+                    this.Left = 1;
+                }
+            });
+        }
         private void K_hook_KeyDownEvent(object sender, System.Windows.Forms.KeyEventArgs e)
         {
             if (e.KeyValue == (int)System.Windows.Forms.Keys.F5 && (int)Control.ModifierKeys == (int)Keys.Control)

XHWK.WKTool/UploadWindow.xaml

@@ -16,9 +16,9 @@
             <!--分4行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="45"/>
-                <RowDefinition Height="80"/>
-                <RowDefinition Height="60"/>
-                <RowDefinition Height="60"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="90"/>
+                <RowDefinition Height="90"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             <!--第一行 标题-->
@@ -32,19 +32,19 @@
             <ComboBox Cursor="Hand"
                             x:Name="book_list"
                             Grid.Row="2"
-                            Height="30"
-                      Width="300"
+                            Height="50"
+                      Width="400"
                             Margin="0,0,0,0"
                             Padding="10,0,0,0"
                             VerticalContentAlignment="Center"
                             DisplayMemberPath="Value"
-                            FontSize="14"
+                            FontSize="18"
                             ItemsSource="{Binding bookList}"
                             SelectedValuePath="Key"
-                      SelectionChanged="toolbar_list_SelectionChanged"
+                      SelectionChanged="toolbar_list_SelectionChanged" BorderBrush="#FFCDD6E0" Foreground="Black" Background="White"
                           >
                 <ComboBox.Resources>
-                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="WhiteSmoke" />
+                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
                     <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" />
                 </ComboBox.Resources>
             </ComboBox>
@@ -52,16 +52,21 @@
             <ComboBox Cursor="Hand"
                             x:Name="cmbTeachingMaterial"
                             Grid.Row="3"
-                               Height="30"
-                             Width="300"
+                               Height="50"
+                             Width="400"
                             Padding="10,0,0,0"
                             VerticalContentAlignment="Center"
-                            Background="White"
+                          
                             DisplayMemberPath="Value"
-                            FontSize="14"
+                            FontSize="18"
                             Foreground="Black"
                             ItemsSource="{Binding zhangjieList}"
-                            SelectedValuePath="Key" />
+                            SelectedValuePath="Key" BorderBrush="#FFCDD6E0" >
+                <ComboBox.Resources>
+                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
+                    <!--<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Green" />-->
+                </ComboBox.Resources>
+            </ComboBox>
             <!--第四行 开始按钮-->
             <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="确定" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>

XHWK.WKTool/UploadWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using Common.system;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -42,6 +43,10 @@ namespace XHWK.WKTool
         /// 文件类型
         /// </summary>
         private string Suffix = string.Empty;
+        /// <summary>
+        /// 唯一编号
+        /// </summary>
+        private string Guid = string.Empty;
         public UploadWindow()
         {
             InitializeComponent();
@@ -49,11 +54,12 @@ namespace XHWK.WKTool
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(string _resourcename,long _resourcesize,string _suffix) 
+        public void Initialize(string _resourcename,long _resourcesize,string _suffix,string _guid) 
         {
             Resourcename = _resourcename;
             Resourcesize = _resourcesize;
             Suffix = _suffix;
+            Guid = _guid;
             Tsubjectbook();
         }
         /// <summary>
@@ -184,65 +190,85 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
-            //        converted: 0
-            //createid: 80
-            //directorid: 1009
-            //duration: 39
-            //imgUrl: ""
-            //level: 2
-            //lsbid: 40
-            //mp4code: "h264"
-            //resourcebelong: 3
-            //resourceclass: 2
-            //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
-            //resourcename: "weather_pic"
-            //resourcesize: 6105268
-            //resourcetype: 0
-            //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
-            //schoolid: 12
-            //suffix: "mp4"
-            //uid: 80
-            Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
-            model_ResourceAdd.converted = 0;
-            model_ResourceAdd.createid = APP.UserInfo.Userid;
-            model_ResourceAdd.directorid= Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString());
-            model_ResourceAdd.duration = APP.ResourceAddTwo.duration;
-            model_ResourceAdd.imgUrl = "";
-            model_ResourceAdd.level = 2;
-            model_ResourceAdd.lsbid= Convert.ToInt32(book_list.SelectedValue.ToString());
-            model_ResourceAdd.mp4code = APP.ResourceAddTwo.mp4code;
-            model_ResourceAdd.resourcebelong = 3;
-            model_ResourceAdd.resourceclass = 2;
-            model_ResourceAdd.resourcecover = APP.ResourceAddTwo.coverpath;
-            model_ResourceAdd.resourcename = Resourcename;
-            model_ResourceAdd.resourcesize = Resourcesize;//zxy 文件大小
-            model_ResourceAdd.resourcetype = 0;
-            model_ResourceAdd.resourceurl = APP.ResourceAddTwo.videopath;
-            model_ResourceAdd.schoolid = APP.UserInfo.Schoolid;
-            if(Suffix.Equals("FLV"))
-            {
-                Suffix = "flv";
-            }
-            else if(Suffix.Equals("AVI"))
-            {
-                Suffix = "avi";
-            }
-            else
-            {
-                Suffix = "mp4";
-            }
 
-            model_ResourceAdd.suffix = Suffix;
-            //model_ResourceAdd.uid = 0;//zxy
-            int code = @interface.ResourceAdd(model_ResourceAdd);
-            if(code==0)
+            try
             {
-                MessageWindow.Show("视频上传成功！");
-                Hide();
+                DAL_Upload dAL_Upload = new DAL_Upload();
+                if (dAL_Upload.UploadVideoTwo(Guid, out string ErrMessage))
+                {
+
+
+                    //        converted: 0
+                    //createid: 80
+                    //directorid: 1009
+                    //duration: 39
+                    //imgUrl: ""
+                    //level: 2
+                    //lsbid: 40
+                    //mp4code: "h264"
+                    //resourcebelong: 3
+                    //resourceclass: 2
+                    //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
+                    //resourcename: "weather_pic"
+                    //resourcesize: 6105268
+                    //resourcetype: 0
+                    //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
+                    //schoolid: 12
+                    //suffix: "mp4"
+                    //uid: 80
+                    Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
+                    model_ResourceAdd.converted = 0;
+                    model_ResourceAdd.createid = APP.UserInfo.Userid;
+                    model_ResourceAdd.directorid = Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString());
+                    model_ResourceAdd.duration = APP.ResourceAddTwo.duration;
+                    model_ResourceAdd.imgUrl = "";
+                    model_ResourceAdd.level = 2;
+                    model_ResourceAdd.lsbid = Convert.ToInt32(book_list.SelectedValue.ToString());
+                    model_ResourceAdd.mp4code = APP.ResourceAddTwo.mp4code;
+                    model_ResourceAdd.resourcebelong = 3;
+                    model_ResourceAdd.resourceclass = 2;
+                    model_ResourceAdd.resourcecover = APP.ResourceAddTwo.coverpath;
+                    model_ResourceAdd.resourcename = Resourcename;
+                    model_ResourceAdd.resourcesize = Resourcesize;//zxy 文件大小
+                    model_ResourceAdd.resourcetype = 0;
+                    model_ResourceAdd.resourceurl = APP.ResourceAddTwo.videopath;
+                    model_ResourceAdd.schoolid = APP.UserInfo.Schoolid;
+                    if (Suffix.Equals("FLV"))
+                    {
+                        Suffix = "flv";
+                    }
+                    else if (Suffix.Equals("AVI"))
+                    {
+                        Suffix = "avi";
+                    }
+                    else
+                    {
+                        Suffix = "mp4";
+                    }
+
+                    model_ResourceAdd.suffix = Suffix;
+                    //model_ResourceAdd.uid = 0;//zxy
+                    int code = @interface.ResourceAdd(model_ResourceAdd);
+                    if (code == 0)
+                    {
+                        MessageWindow.Show("视频上传成功！");
+                        Hide();
+                    }
+                    else
+                    {
+                        MessageWindow.Show(APP.ServerMsg);
+                    }
+                }
+                else
+                {
+                    MessageWindow.Show(ErrMessage);
+                }
             }
-            else
+            catch (Exception ex)
             {
-                MessageWindow.Show(APP.ServerMsg);
+                MessageWindow.Show("视频上传失败！");
+                Hide();
+                LogHelper.WriteErrLog("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
             }
         }
     }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -8,8 +8,8 @@
         xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课系统" Height="1040" Width="1276" WindowStartupLocation="CenterScreen"
-    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
+        Title="星火微课系统" Height="1036" Width="1276" 
+    WindowStyle="None"    AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -139,136 +139,138 @@
         </RadialGradientBrush>
     </Window.BorderBrush>
 
-    <Viewbox>
-        <Border Background="#cdcdcd" Height="1040" Width="1280">
-            <Grid x:Name="GridContent" Height="1036" Width="1276">
+    <Viewbox> 
+        <Canvas Height="1036" Width="1276">
+            
+     
+        <Grid x:Name="GridContent" Height="1036" Width="1276">
 
-                <!--分3行-->
+            <!--分3行-->
+            <Grid.RowDefinitions>
+                <RowDefinition Height="10*"/>
+                <RowDefinition Height="86*"/>
+                <RowDefinition Height="3.5*"/>
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="106"/>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="40"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
-                    <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,10,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 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,10,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">
                         <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>
-                    <!--第二行-->
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,6,0,0">
-                        <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"/>
-                        <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
-                        <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
-                            <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">
+                    <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,6,0,0">
+                    <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"/>
+                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
+                    <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
+                        <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="Collapsed"/>
-                                <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
-                                <TextBlock Text="我的" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                        <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnSetUp_Click">
-                            <StackPanel Orientation="Vertical">
-                                <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" Width="1276" 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>
+                    <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnUpload_Click">
+                        <StackPanel Orientation="Vertical">
+                            <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
+                            <TextBlock Text="我的" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnSetUp_Click">
+                        <StackPanel Orientation="Vertical">
+                            <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" Width="1276" 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"
+                                    <!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
                                             <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
@@ -276,158 +278,133 @@
                              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" 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>
-                            <!--导入图片-->
-                            <!--<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" />
-                            
-                            <Image x:Name="imgDocumentation" Visibility="Visible" Width="0" Height="0" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="472,246,0,0" />
+                                    <!--图片表框 -->
+                                    <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" 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"/>
+
+                        <!--导入图片-->
+                        <!--<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"/>
-                </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"/>
+            </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>
+                        <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>
+                        </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>
-                        </Grid>
-                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        </StackPanel>
+                    </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="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                        <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                        <TextBlock x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                        <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                        <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="10,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"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                        <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="10,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>
-                    <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                        <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="2,26,10,0"/>
-                        <!--输入框-->
-                        <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
-                            <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" 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
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                                    </Border>
-                                </ControlTemplate>
-                            </Button.Template>
-                        </Button>
-                    </StackPanel>
-                    <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                        <TextBlock Text="    版本号" FontSize="16" Width="80" Foreground="#2D8CF0"/>
-                        <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                        <TextBlock Text="版权所有" FontSize="16" Width="80" Foreground="#2D8CF0"/>
-                        <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
-                    </StackPanel>
-                    <!--第四行 开始按钮-->
-                    <Button Cursor="Hand" Grid.Row="6" 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.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="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0" Width="80"/>
+                    <TextBlock x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0" Width="80"/>
+                    <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="10,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"/>
+                </StackPanel>
+                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0" Width="80"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="10,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>
+                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="2,26,10,0"/>
+                    <!--输入框-->
+                    <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
+                        <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" 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>#2D8CF0</Border.Background>
+                                    <Border.Background>#EBEFF3</Border.Background>
                                     <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -436,60 +413,86 @@
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
-                </Grid>
-                <!--上传-->
-                <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Collapsed">
-                    <Border Width="1276" Background="#EFF1F8">
-                        <Grid  Width="1236" Background="#FFFFFF" Margin="0,0,0,0">
-                            <!--分4行-->
+                </StackPanel>
+                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="    版本号" FontSize="16" Width="80" Foreground="#2D8CF0"/>
+                    <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="版权所有" FontSize="16" Width="80" Foreground="#2D8CF0"/>
+                    <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
+                </StackPanel>
+                <!--第四行 开始按钮-->
+                <Button Cursor="Hand" Grid.Row="6" 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
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+            </Grid>
+            <!--上传-->
+            <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Collapsed">
+                <Border Width="1276" Background="#EFF1F8">
+                    <Grid  Width="1236" 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">
                             <Grid.RowDefinitions>
+                                <RowDefinition Height="45"/>
                                 <RowDefinition Height="*"/>
-                                <RowDefinition Height="30"/>
                             </Grid.RowDefinitions>
-                            <!--第二行 内容-->
-                            <Grid Grid.Row="0" Margin="0,0,0,0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="45"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <UniformGrid x:Name="uniStatisticsByTitle"
+                            <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"
@@ -498,84 +501,84 @@
                     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"/>
-                                        </StackPanel>
+                                <Button.Content>
+                                    <StackPanel>
+                                        <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
                                     </StackPanel>
-                                </Grid>
-                                <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                </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>
+                            </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,10,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 Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
+                <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
+                    <TextBlock Text="颜色：" FontSize="14" Padding="10,10,0,0"/>
+                    <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
 
-                        <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
-                            <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
-                        </Button>
-                        <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
-                            <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                        </Button>
-                        <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
-                            <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                        </Button>
-                        <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
-                            <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                        </Button>
-                        <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
-                            <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
-                        </Button>
-                        <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,10,0,0" IsChecked="True" Click="RbnFine_Click"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,10,0,0" Click="RbnIn_Click"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,10,0,0" Click="RbnCrude_Click"/>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="摄像头：" FontSize="14" Padding="15,10,0,0"/>
-                            <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,10,0,0" Click="RbnOpen_Click"/>
-                            <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,10,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,0">
-                        <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,5,0,0"/>
-                        <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,5,5,0"/>
+                    <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
+                        <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
+                        <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
+                        <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
+                        <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                    </Button>
+                    <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
+                        <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                    </Button>
+                    <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,10,0,0" IsChecked="True" Click="RbnFine_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,10,0,0" Click="RbnIn_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,10,0,0" Click="RbnCrude_Click"/>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="摄像头：" FontSize="14" Padding="15,10,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,10,0,0" Click="RbnOpen_Click"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,10,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                     </StackPanel>
-                </Grid>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,0">
+                    <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,5,0,0"/>
+                    <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,5,5,0"/>
+                </StackPanel>
             </Grid>
-        </Border>
+        </Grid>
+        </Canvas>
     </Viewbox>
 </Window>

XHWK.WKTool/ZConfig.cs

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