合并

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -13,6 +13,17 @@
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
+    <!--<Grid>
+        <Border CornerRadius="0,0,0,0"
+                Background="White"
+                BorderBrush="Gray"
+                BorderThickness="1"
+                Margin="10,10,10,10">
+            <Border.Effect>
+                <DropShadowEffect Color="Gray" BlurRadius="10" ShadowDepth="0" Opacity="0.8" />
+            </Border.Effect>
+        </Border>
+    </Grid>-->
     <Window.Resources>
         <!--  ListBox容器样式  -->
         <Style x:Key="ListBoxItemContainerStyle" TargetType="{x:Type ListBoxItem}">
@@ -64,6 +75,17 @@
                         </Button>
                     </StackPanel>
                 </Grid>
+
+
+                <!--分值-->
+                <!--
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding VideoDuration}" />-->
+
+                <!--平均时长-->
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
@@ -75,6 +97,7 @@
                     VerticalAlignment="Center"
                     FontSize="16"
                     Text="{Binding VideoTime}" />
+
                 <Grid>
                     <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
                     VerticalAlignment="Center">
@@ -104,6 +127,8 @@
                         </Button>
                     </StackPanel>
                 </Grid>
+
+
             </UniformGrid>
         </DataTemplate>
     </Window.Resources>
@@ -122,131 +147,141 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px" MouseDown="Grid_MouseDown">
-                <Grid.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>
+        <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px" MouseDown="Grid_MouseDown">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <!--第一行-->
+            <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,2,10,0">
+                <Image Source="./Images/microLessonSystem_0.png"/>
+                <TextBlock Text="星火微课系统" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
+            </StackPanel>
 
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,20,0">
-                    <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="./Images/microLessonSystem_9.png"/>
-                            <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="8,0,8,0">
-                        <Image Source="./Images/microLessonSystem_19.png"/>
-                    </Button>
-                    <!--<Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
+            <StackPanel 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,0,0,5" HorizontalAlignment="Left">
-                    <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
-                            <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
-                            <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnScreenshot_Click">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgScreenshot" Source="./Images/microLessonSystem_12.png"/>
-                            <Image x:Name="ImgScreenshotTwo" Source="./Images/microLessonSystem_11.png" Visibility="Collapsed"/>
-                            <TextBlock Text="截图" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click" Margin="30,0,0,0">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgImport" Source="./Images/microLessonSystem_6.png"/>
-                            <Image x:Name="ImgImportTwo" Source="./Images/microLessonSystem_7.png" Visibility="Collapsed"/>
-                            <TextBlock Text="导入" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="100,0,0,0" Click="BtnRecord_Click">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
-                            <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
-                            <TextBlock x:Name="TxbRecordingWord" Text="录制" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click" Margin="30,0,0,0">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgStop" Source="./Images/microLessonSystem_21.png"/>
-                            <Image x:Name="ImgStopTwo" Source="./Images/microLessonSystem_20.png" Visibility="Collapsed"/>
-                            <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <TextBlock x:Name="txbTime" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
-                </StackPanel>
-                <StackPanel Grid.Row="1" HorizontalAlignment="Center">
-                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="0,25,0,0"/>
-                </StackPanel>
-                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,5">
-                    <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
-                            <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
-                            <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnPrint_Click">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgPrint" Source="./Images/microLessonSystem_4.png" Visibility="Collapsed"/>
-                            <Image x:Name="ImgPrintTwo" Source="./Images/microLessonSystem_5.png" Visibility="Visible"/>
-                            <TextBlock Text="打印" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <!--<Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click" Margin="0,0,30,0">
+            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0,0,5" HorizontalAlignment="Left">
+                <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
+                        <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
+                        <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnScreenshot_Click">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgScreenshot" Source="./Images/microLessonSystem_12.png"/>
+                        <Image x:Name="ImgScreenshotTwo" Source="./Images/microLessonSystem_11.png" Visibility="Collapsed"/>
+                        <TextBlock Text="截图" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click" Margin="30,0,0,0">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgImport" Source="./Images/microLessonSystem_6.png"/>
+                        <Image x:Name="ImgImportTwo" Source="./Images/microLessonSystem_7.png" Visibility="Collapsed"/>
+                        <TextBlock Text="导入" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="100,0,0,0" Click="BtnRecord_Click">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
+                        <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
+                        <TextBlock x:Name="TxbRecordingWord" Text="录制" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click" Margin="30,0,0,0">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgStop" Source="./Images/microLessonSystem_21.png"/>
+                        <Image x:Name="ImgStopTwo" Source="./Images/microLessonSystem_20.png" Visibility="Collapsed"/>
+                        <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <TextBlock x:Name="txbTime" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
+            </StackPanel>
+            <StackPanel Grid.Row="1" HorizontalAlignment="Center">
+                <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="0,25,0,0"/>
+            </StackPanel>
+            <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,5">
+                <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
+                        <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
+                        <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnPrint_Click">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgPrint" Source="./Images/microLessonSystem_4.png" Visibility="Collapsed"/>
+                        <Image x:Name="ImgPrintTwo" Source="./Images/microLessonSystem_5.png" Visibility="Visible"/>
+                        <TextBlock Text="打印" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <!--<Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click" Margin="0,0,30,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_15.png" Visibility="Collapsed"/>
                             <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_16.png" Visibility="Visible"/>
                             <TextBlock Text="上传" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>-->
-                    <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnUpload_Click">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
-                            <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
-                            <TextBlock Text="我的" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnSetUp_Click">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>
-                            <Image x:Name="ImgSetUpTwo" Source="./Images/microLessonSystem_17.png" Visibility="Collapsed"/>
-                            <TextBlock Text="设置" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
+                <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnUpload_Click">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
+                        <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
+                        <TextBlock Text="我的" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnSetUp_Click">
+                    <StackPanel Orientation="Vertical">
+                        <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>
+                        <Image x:Name="ImgSetUpTwo" Source="./Images/microLessonSystem_17.png" Visibility="Collapsed"/>
+                        <TextBlock Text="设置" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
             </Grid>
-            <!--主内容-->
+
+        <!--主内容-->
         <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">
             <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
                 <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
                     <Grid>
                         <Border Grid.Row="1"  CornerRadius="5">
                             <Grid x:Name="IMG" Margin="0,0,0,0">
-                                    <Grid.Resources>
-                                        <TransformGroup x:Key="Imageview">
-                                            <ScaleTransform/>
-                                            <TranslateTransform/>
-                                        </TransformGroup>
-                                    </Grid.Resources>
-                                    <!--图片表框 -->
+                                <Grid.Resources>
+                                    <TransformGroup x:Key="Imageview">
+                                        <ScaleTransform/>
+                                        <TranslateTransform/>
+                                    </TransformGroup>
+                                </Grid.Resources>
+
+                                <!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
+                  Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
+                                            <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
+                             MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
+                             MouseMove="IMG1_MouseMove"
+                             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"/>
                                 <!--四个点 -->
@@ -259,9 +294,22 @@
                             </Grid>
                         </Border>
                     </Grid>
-                        <Image x:Name="imgDocumentation" Visibility="Visible"/>
-                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
-                    </Grid>
+                    <Image x:Name="imgDocumentation" Visibility="Visible"/>
+
+                    <!--导入图片-->
+                    <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
+                    <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
+
+
+                    <!--摄像头-->
+                    <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
+                    <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
+                </wfi:WindowsFormsHost>-->
+                    <!--<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"/>
@@ -271,7 +319,8 @@
             <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>
+            <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
+        </Grid>
         <!--页码-->
         <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
             <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2282,9 +2282,9 @@ namespace XHWK.WKTool
                     #endregion
                     IsFirstR = false;
                     RsImgName = new List<string>();
-                    ///启动截图
-                    timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 200);
                     SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+                    ///启动截图
+                    timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 20);
                     //{
                     //    AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
                     //};//设置执行一次（false）还是一直执行(true)
@@ -2324,6 +2324,7 @@ namespace XHWK.WKTool
                         Thread.Sleep(1000);
                         Dispatcher.Invoke(() =>
                         {
+                            Recorddt = DateTime.Now;
                             IsStartCount = true;
                             //Stack();
                             //timer.Start();
@@ -2379,38 +2380,70 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 录制保存图片
+        /// 记录上次截图时间
+        /// </summary>
+        DateTime Recorddt = DateTime.Now;
+        /// <summary>
+        /// 录制保存图片计时器
         /// </summary>
         /// <param name="sender"></param>
         private void Timer_Elapsed(object sender)
         {
             if (IsStartCount)
             {
-                try
+                DateTime dt = DateTime.Now;
+                TimeSpan ts = dt.Subtract(Recorddt);//时间差   
+                double tsmi = ts.TotalMilliseconds;
+                if (tsmi > 200.0)
                 {
-                    Dispatcher.Invoke(() =>
+                    Recorddt = Recorddt.AddMilliseconds(200);
+                    Thread thread = new Thread(RecordSaveImage);
+                    //开启线程
+                    thread.Start();
+                }
+            }
+        }
+        /// <summary>
+        /// 录制保存图片
+        /// </summary>
+        void RecordSaveImage()
+        {
+            try
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    if (IsStartCount)
                     {
                         string FilePathName = ImgPath + RsImgName.Count + ".png";
                         RsImgName.Add(FilePathName);
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)ActualWidth, (int)ActualHeight);
-                        SRTime=SRTime.AddMilliseconds(200);
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)));
+                        SRTime = SRTime.AddMilliseconds(200);
+                        if (txbTime.Visibility == Visibility.Hidden)
+                        {
+                            txbTime.Visibility = Visibility.Visible;
+                        }
                         if (SRTime.Hour > 0)
                         {
+                            //Dispatcher.Invoke(() =>
+                            //{
                             txbTime.Text = SRTime.ToString("HH:mm:ss");
+                            //});
                         }
                         else
                         {
+                            //Dispatcher.Invoke(() =>
+                            //{
                             txbTime.Text = SRTime.ToString("mm:ss");
+                            //});
                         }
-                    });
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【录制】(Timer_Elapsed)生成图片错误:" + ex.Message, ex);
-                }
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【录制】(Timer_Elapsed)生成图片错误:" + ex.Message, ex);
             }
         }
-
         /// <summary>
         /// 停止录制并生成录制文件
         /// </summary>
@@ -2503,6 +2536,7 @@ namespace XHWK.WKTool
                     APP.FFmpeg.StopFFmpeg(AudioPathName);
                     new Thread(new ThreadStart(new Action(() =>
                     {
+                        IsStartCount = false;
                         //停止截图
                         while (APP.FFmpeg.myProcess != null)
                         {
@@ -2510,7 +2544,6 @@ namespace XHWK.WKTool
                         }
                         Dispatcher.Invoke(() =>
                         {
-                            IsStartCount = false;
                             timer.Change(-1, 0);
                             timer.Dispose();
                                     //End();
@@ -4150,5 +4183,11 @@ namespace XHWK.WKTool
         {
             Thread.Sleep(2000);
         }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            
+            MessageWindow.Show("A："+ActualWidth*(PrimaryScreen.DpiX / 96f)+"x" +ActualHeight * (PrimaryScreen.DpiY / 96f) + "  wh："+Width+"x"+Height);
+        }
     }
 }