zhao：1解决第二次导入和截图录屏闪退问题 2增加视频大小比特

Common/system/BlackboardNew.cs

@@ -16,12 +16,22 @@ namespace Common.system
         Pen = 1,
         Erase = 2
     };
-
+    /// <summary>
+    /// 画板线模型
+    /// </summary>
     internal class ZBBPage
     {
+        /// <summary>
+        /// 线
+        /// </summary>
         public List<ZBBPageStep> lines { get; set; }
+        /// <summary>
+        /// 历史记录
+        /// </summary>
         public List<ZBBPageStep> lines_histoty { get; set; }
-
+        /// <summary>
+        /// 画板模型
+        /// </summary>
         public ZBBPage()
         {
             lines = new List<ZBBPageStep>();
@@ -47,13 +57,26 @@ namespace Common.system
         private InkCanvas m_canvas;
 
         //private ZPenType type = ZPenType.Pen;
+        /// <summary>
+        /// 当前页索引
+        /// </summary>
         private int pagenum = 0;
-
+        /// <summary>
+        /// 橡皮大小
+        /// </summary>
         private readonly int erasesize = 64;
+        /// <summary>
+        /// 笔粗细
+        /// </summary>
         private readonly int pensize = 3;
         private int undoOrRedo = 0; //是否在进行撤销恢复操作
+        /// <summary>
+        /// 笔颜色
+        /// </summary>
         private Color pencolor;
-
+        /// <summary>
+        /// 所有画板线
+        /// </summary>
         private readonly List<ZBBPage> strokes_page_all = new List<ZBBPage>();
 
         // 添加这个变量是因为在用橡皮擦时 一次操作会触发多次StrokesChanged回掉 这里是把多次回掉合并在一起
@@ -118,13 +141,28 @@ namespace Common.system
                     strokes_page_all.Add(pagetemp);
                 }
 
-
-                ZBBPage page = strokes_page_all[pagenum];
-                if (page != null)
+                try
                 {
-                    step.lines_curr.Add(m_canvas.Strokes);
-                    page.lines.Add(step);
-                    step = null;
+                    ZBBPage page = strokes_page_all[pagenum];
+                    if (page != null)
+                    {
+                        step.lines_curr.Add(m_canvas.Strokes);
+                        page.lines.Add(step);
+                        step = null;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    if (strokes_page_all != null)
+                    {
+                        if (strokes_page_all.Count == 0)
+                        {
+                            ZBBPage pagetemp = new ZBBPage();
+                            pagetemp.lines.Add(new ZBBPageStep());
+                            strokes_page_all.Add(pagetemp);
+                        }
+                    }
+                    LogHelper.WriteErrLog("【画板】（Canvas_MouseUp）添加失败，strokes_page_all为0，" + ex.Message, ex);
                 }
             }
         }
@@ -261,12 +299,16 @@ namespace Common.system
 
 
         }
-
+        /// <summary>
+        /// 翻页
+        /// </summary>
+        /// <param name="mpagenum"></param>
         public void changepage(int mpagenum)
         {
             if (pagenum != mpagenum)
             {
                 pagenum = mpagenum;
+                //新增页
                 if (pagenum >= strokes_page_all.Count)
                 {
                     int numadd = pagenum - strokes_page_all.Count + 1;

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -146,6 +146,7 @@ namespace XHWK.WKTool
                             if (string.IsNullOrWhiteSpace(videoinfo.VideoSize) || videoinfo.VideoSize == "0 MB")
                             {
                                 videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
+                                videoinfo.VideoSizebyte = FileToolsCommon.GetFileSize(videoinfo.VideoPath);
                             }
                             model_VideoList.Add(videoinfo);
                         }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -140,141 +140,143 @@
     </Window.BorderBrush>
 
 
-        <Grid x:Name="GridContent" Height="1030" Width="1276" >
+    <Grid x:Name="GridContent" Height="1030" Width="1276" >
 
-            <!--分3行-->
+        <!--分3行-->
+        <Grid.RowDefinitions>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="85*"/>
+            <RowDefinition Height="5*"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="10*"/>
-                <RowDefinition Height="85*"/>
-                <RowDefinition Height="5*"/>
+                <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" 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 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">
                         <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,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 Grid.Row="1" Orientation="Horizontal" Margin="10,6,0,0" 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="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>
+                <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" 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>
+        </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"
+                                <!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
                                             <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
@@ -282,159 +284,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" 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"/>
+                                <!--图片表框 -->
+                                <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"/>
 
-                        <!--导入图片-->
-                        <!--<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"/>
-            </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>
-                            <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>
+                        <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="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15"/>
+                            <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
+                            <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
+                        </StackPanel>
+                    </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"
@@ -443,60 +419,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"
@@ -505,84 +507,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,-15,0,0" Click="BtnRed_Click">
-                        <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
-                    </Button>
+                <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,-15,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,-15,0,0" Click="BtnGray_Click">
-                        <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>
                 <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnCyanBlue_Click">
-                        <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>
                 <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnYellow_Click">
-                        <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>
                 <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,-15,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"/>
+                    <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>
 
+    </Grid>
+
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -802,6 +802,7 @@ namespace XHWK.WKTool
                     {
                         APP.pageData.pagenum += 1;
                         APP.pageData.currpage = APP.pageData.pagenum;
+                        myblackboard.changepage(APP.pageData.currpage - 1);
                         gridPage.Visibility = Visibility.Visible;//页码大于0 显示
                     }
                     if (APP.PageDrawList.Count >= APP.pageData.currpage)
@@ -913,6 +914,7 @@ namespace XHWK.WKTool
                 {
                     APP.myloading.Show();
 
+                    myblackboard.changepage(APP.pageData.pagenum);
                     #region PPT转PDF
                     string filepath = ofd.FileName;
                     string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx","").Trim();
@@ -1261,6 +1263,7 @@ namespace XHWK.WKTool
                             if (string.IsNullOrWhiteSpace(videoinfo.VideoSize) || videoinfo.VideoSize == "0 MB")
                             {
                                 videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
+                                videoinfo.VideoSizebyte = FileToolsCommon.GetFileSize(videoinfo.VideoPath);
                             }
                             model_VideoList.Add(videoinfo);
                         }