Merge remote-tracking branch 'origin/zyy' into zhangxueyang

Common/system/FFMpeg.cs

@@ -62,7 +62,7 @@ namespace Common.system
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             switch (Extension.ToUpper())
             {
-                case "MP4":
+                case ".MP4":
                     if (string.IsNullOrWhiteSpace(MicrophoneName))
                     {
                         myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f avi " + PathName;  //ffmpeg的参数
@@ -73,8 +73,8 @@ namespace Common.system
                             MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 " + PathName;  //ffmpeg的参数
                     }
                     break;
-                case "AVI":
-                case "FLV":
+                case ".AVI":
+                case ".FLV":
                     if (string.IsNullOrWhiteSpace(MicrophoneName))
                     {
                         myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
@@ -255,19 +255,19 @@ namespace Common.system
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             switch (Extension.ToUpper())
             {
-                case "MP4":
+                case ".MP4":
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
                         ImageListPath + @"%d.png -i " +
                         Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
                         VideoSavePath;
                     break;
-                case "AVI":
+                case ".AVI":
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
                         ImageListPath + @"%d.png -i " +
                         Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -f AVI " +
                         VideoSavePath;
                     break;
-                case "FLV":
+                case ".FLV":
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
                         ImageListPath + @"%d.png -i " +
                         Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -f FLV " +

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -9,8 +9,7 @@
         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">
+    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -144,118 +143,118 @@
         <Border Background="#cdcdcd" Height="1040" Width="1280">
             <Grid x:Name="GridContent" Height="1036" Width="1276">
 
-            <!--分3行-->
-            <Grid.RowDefinitions>
-                <RowDefinition Height="106"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="40"/>
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
+                <!--分3行-->
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="106"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="40"/>
                 </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">
+                <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">
                         <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>
+                        <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>
+                    <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>
-            <!--主内容-->
+                        <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">
@@ -269,23 +268,33 @@
                                             </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"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown">
-                                                </Image>
                                             </ContentControl>
-                                        </ScrollViewer>
+                                        </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>
                             <!--导入图片-->
-                            <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" />
+                            
+                            <Image x:Name="imgDocumentation" Visibility="Visible" Width="0" Height="0" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="472,246,0,0" />
+
                             <!--摄像头-->
                             <!--<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"  />
@@ -309,90 +318,116 @@
                 <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"/>
+                            </Button.Content>
+                        </Button>
+                        <Grid Width="60"  Background="Transparent">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="311*"/>
+                                <RowDefinition Height="483*"/>
+                            </Grid.RowDefinitions>
+                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
+                                    <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15"/>
+                                    <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
                                     <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                    <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        </Grid>
+                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="next_btn"  Background="Transparent"
                     Width="60" Height="20"
                     Click="next_btn_Click">
-                        <Button.Content>
-                            <StackPanel>
-                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                            </StackPanel>
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-            </Grid>
-            <!--设置-->
-            <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="90"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="50"/>
-                    <RowDefinition Height="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.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.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                        <Border.Background>#EBEFF3</Border.Background>
+                                    <Border.Background>#2D8CF0</Border.Background>
                                     <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -401,86 +436,60 @@
                             </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.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 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">
+                            <!--分4行-->
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="45"/>
                                 <RowDefinition Height="*"/>
+                                <RowDefinition Height="30"/>
                             </Grid.RowDefinitions>
-                            <UniformGrid x:Name="uniStatisticsByTitle"
+                            <!--第二行 内容-->
+                            <Grid Grid.Row="0" Margin="0,0,0,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="45"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <UniformGrid x:Name="uniStatisticsByTitle"
                 Grid.Row="0"
                 Margin="0,0,0,0"
                 Background="#E6F0FF"
                 Columns="5"
                 Rows="1">
-                                <TextBlock
+                                    <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="序号"  />
-                                <TextBlock
+                                    <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="视频名称"/>
-                                <!--<TextBlock
+                                    <!--<TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
                     Text="视频时长" Foreground="White" />-->
-                                <TextBlock
+                                    <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="视频大小"/>
-                                <TextBlock
+                                    <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="日期"/>
-                                <TextBlock
+                                    <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="操作"/>
-                            </UniformGrid>
-                            <ListBox Grid.Row="1" Margin="0,0,0,0"
+                                </UniformGrid>
+                                <ListBox Grid.Row="1" Margin="0,0,0,0"
                     x:Name="listView1"
                     BorderThickness="0"
                     FontSize="20"
@@ -489,53 +498,53 @@
                     ItemsSource="{Binding menuList}" 
                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
-                        </Grid>
-                        <StackPanel Grid.Row="3" x:Name="stpUp" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
+                            </Grid>
+                            <StackPanel Grid.Row="3" x:Name="stpUp" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
             Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
-                            <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="btnLastPage"
                     Width="60" Height="20"
                     Click="BtnLastPage_Click">
-                                <Button.Content>
-                                    <StackPanel>
-                                        <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                                    </StackPanel>
-                                </Button.Content>
-                            </Button>
-                            <Grid Width="60"  Background="Transparent">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="311*"/>
-                                    <RowDefinition Height="483*"/>
-                                </Grid.RowDefinitions>
-                                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
-                                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
-                                        <TextBlock x:Name="txbCurrpageTwo" TextAlignment="Center" FontSize="15"/>
-                                        <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
-                                        <TextBlock x:Name="txbPageNumTwo" TextAlignment="Center" FontSize="15"/>
+                                    <Button.Content>
+                                        <StackPanel>
+                                            <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                        </StackPanel>
+                                    </Button.Content>
+                                </Button>
+                                <Grid Width="60"  Background="Transparent">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="311*"/>
+                                        <RowDefinition Height="483*"/>
+                                    </Grid.RowDefinitions>
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
+                                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
+                                            <TextBlock x:Name="txbCurrpageTwo" TextAlignment="Center" FontSize="15"/>
+                                            <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
+                                            <TextBlock x:Name="txbPageNumTwo" TextAlignment="Center" FontSize="15"/>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                            </Grid>
-                            <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                </Grid>
+                                <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="btnNextPage"  Background="Transparent"
                     Width="60" Height="20"
                     Click="BtnNextPage_Click">
-                                <Button.Content>
-                                    <StackPanel>
-                                        <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                                    </StackPanel>
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
+                                    <Button.Content>
+                                        <StackPanel>
+                                            <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                        </StackPanel>
+                                    </Button.Content>
+                                </Button>
+                            </StackPanel>
 
-                    </Grid>
+                        </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 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>
@@ -551,22 +560,22 @@
                         <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"/>
+                        <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"/>
                     </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"/>
-                </StackPanel>
+                </Grid>
             </Grid>
-        </Grid>
         </Border>
     </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -25,6 +25,8 @@ using System.Collections.Specialized;
 using XHWK.WKTool.Config;
 using System.Windows.Threading;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Windows.Controls.Primitives;
 
 namespace XHWK.WKTool
 {
@@ -946,7 +948,10 @@ namespace XHWK.WKTool
                     if (APP.PageDrawList.Count >= APP.pageData.currpage && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
                         imgDocumentation.Source = null;
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        BitmapImage bitImg=new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        imgCanvas.Source = bitImg;
+                        imgCanvas.Width = bitImg.Width;
+                        imgCanvas.Height = bitImg.Height;
                         APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation = false;
                         ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
                         ImgPrintTwo.Visibility = Visibility.Collapsed;
@@ -1272,7 +1277,10 @@ namespace XHWK.WKTool
                 MessageWindow.Show("请先导入文档或截图！");
                 return;
             }
-
+            if (RectImgBorder.Visibility != Visibility.Hidden)
+            {
+                HideAngleBorder();
+            }
             //btnStop.IsEnabled = true;//停止录制按钮可点击
             StartRecord();
         }
@@ -2123,15 +2131,6 @@ namespace XHWK.WKTool
             Console.WriteLine("mouseXY.X = " + mouseXY.X + "; mouseXY.Y = " + mouseXY.Y);
 
         }
-        private void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            System.Windows.Point point = e.GetPosition(imgCanvas);
-            //Console.WriteLine("PicEmap.X = " + point.X + "; PicEmap.Y = " + point.Y);
-            //if ((point.X - 304) * (point.X - 304) + (point.Y - 86) * (point.Y - 86) < 100) 
-            //{
-            //    Console.WriteLine("在范围内");
-            //}
-        }
         private void IMG1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
             var img = sender as ContentControl;
@@ -3211,5 +3210,194 @@ namespace XHWK.WKTool
             }    
         }
         #endregion
+
+        #region 图片拉伸移动
+        /// <summary>
+        /// 隐藏图片四个点和线
+        /// </summary>
+        void HideAngleBorder()
+        {
+            RectLeftUp.Visibility = Visibility.Hidden;
+            RectRightUp.Visibility = Visibility.Hidden;
+            RectLeftDown.Visibility = Visibility.Hidden;
+            RectRightDown.Visibility = Visibility.Hidden;
+            RectImgBorder.Visibility = Visibility.Hidden;
+        }
+        void ShowAngleBorder()
+        {
+            PointLocation();
+            RectLeftUp.Visibility = Visibility.Visible;
+            RectRightUp.Visibility = Visibility.Visible;
+            RectLeftDown.Visibility = Visibility.Visible;
+            RectRightDown.Visibility = Visibility.Visible;
+            RectImgBorder.Visibility = Visibility.Visible;
+        }
+       /// <summary>
+       /// 确定四个点和边框的位置大小
+       /// </summary>
+        void PointLocation()
+        {
+            RectImgBorder.Width = imgCanvas.ActualWidth + 10.0;
+            RectImgBorder.Height = imgCanvas.ActualHeight + 10.0;
+            RectImgBorder.Margin = new Thickness(imgCanvas.Margin.Left - 5.0, imgCanvas.Margin.Top - 5.0, 0, 0);
+
+            Canvas.SetLeft(RectLeftUp, imgCanvas.Margin.Left - 10.0);
+            Canvas.SetTop(RectLeftUp, imgCanvas.Margin.Top - 10.0);
+
+            Canvas.SetLeft(RectRightUp, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
+            Canvas.SetTop(RectRightUp, imgCanvas.Margin.Top - 10.0);
+
+            Canvas.SetLeft(RectLeftDown, imgCanvas.Margin.Left - 10.0);
+            Canvas.SetTop(RectLeftDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
+
+            Canvas.SetLeft(RectRightDown, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
+            Canvas.SetTop(RectRightDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 图片失去焦点事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void imgCanvas_LostFocus(object sender, RoutedEventArgs e)
+        {
+            //HideAngleBorder();
+        }
+
+        /// <summary>
+        /// 图片获取焦点事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void imgCanvas_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ShowAngleBorder();
+        }
+        System.Windows.Point initialPoint;
+        private void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            System.Windows.Point point = e.GetPosition(imgCanvas);
+            initialPoint = point;
+            //Console.WriteLine("PicEmap.X = " + point.X + "; PicEmap.Y = " + point.Y);
+            //if ((point.X - 304) * (point.X - 304) + (point.Y - 86) * (point.Y - 86) < 100) 
+            //{
+            //    Console.WriteLine("在范围内");
+            //}
+            HideAngleBorder();
+        }
+        private void imgCanvas_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                System.Windows.Point point = e.GetPosition(imgCanvas);
+                imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left + (point.X - initialPoint.X), imgCanvas.Margin.Top + (point.Y - initialPoint.Y), 0, 0);
+            }
+        }
+
+        private void imgCanvas_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            ShowAngleBorder();
+        }
+        System.Drawing.PointF imgRightDown;
+        private void RectRightUp_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
+        {
+            try
+            {
+                Thumb thu = (Thumb)sender;
+                imgRightDown = new System.Drawing.PointF((float)(imgCanvas.Margin.Left + imgCanvas.ActualWidth), (float)(imgCanvas.Margin.Top + imgCanvas.ActualHeight));
+                HideAngleBorder();
+                switch (thu.Name)
+                {
+                    case "RectLeftUp":
+                        RectLeftUp.Visibility = Visibility.Visible;
+                        break;
+                    case "RectRightUp":
+                        RectRightUp.Visibility = Visibility.Visible;
+                        break;
+                    case "RectLeftDown":
+                        RectLeftDown.Visibility = Visibility.Visible;
+                        break;
+                    case "RectRightDown":
+                        RectRightDown.Visibility = Visibility.Visible;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageWindow.Show(ex.Message);
+            }
+        }
+        private void RectRightUp_DragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
+        {
+            try
+            {
+            Thumb thu = (Thumb)sender;
+            Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+            Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                switch (thu.Name)
+                {
+                    case "RectLeftUp":
+                        imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
+                        imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
+                        imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, Mouse.GetPosition(gridM).Y, 0, 0);
+                        break;
+                    case "RectRightUp":
+                        imgCanvas.Width = Mouse.GetPosition(gridM).X - imgCanvas.Margin.Left;
+                        imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
+                        imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left, Mouse.GetPosition(gridM).Y, 0, 0);
+                        break;
+                    case "RectLeftDown":
+                        imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
+                        imgCanvas.Height = Mouse.GetPosition(gridM).Y - imgCanvas.Margin.Top;
+                        imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, imgCanvas.Margin.Top, 0, 0);
+                        break;
+                    case "RectRightDown":
+                        imgCanvas.Width += e.HorizontalChange;
+                        imgCanvas.Height += e.VerticalChange;
+                        break;
+                    default:
+                        break;
+                }
+                //lbl1.Content = imgCanvas.Margin.Left + "," + imgCanvas.Margin.Top;
+                //lbl2.Content = (imgCanvas.Margin.Left+ imgCanvas.Width) +"," + imgCanvas.Margin.Top;
+                //lbl3.Content = imgCanvas.Margin.Left + "," + (imgCanvas.Margin.Top+ imgCanvas.Height);
+                //lbl4.Content= (imgCanvas.Margin.Left + imgCanvas.Width )+ "," + (imgCanvas.Margin.Top + imgCanvas.Height);
+            }
+            catch (Exception ex)
+            {
+                MessageWindow.Show(ex.Message);
+            }
+        }
+
+        private void RectRightUp_DragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
+        {
+            ShowAngleBorder();
+        }
+
+        private void gridM_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+
+        private void IMG_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void GridMain_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void Grid_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            HideAngleBorder();
+        }
     }
 }