zhao：1解决百分比125%遮挡问题。

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -29,7 +29,7 @@ namespace XHWK.WKTool
             ResizeMode = ResizeMode.NoResize;
             if (!APP.CheckScreenCapturerRecorder())
             {
-                MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");
+                MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
                 APP.InstallScreenCapturerRecorder();
             }
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -318,18 +318,18 @@
                              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}" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
-                                    <!--四个点 -->
-                                    <Canvas>
-                                        <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                    </Canvas>
-                                </Grid>
-                            </Border>
+                                        <!--图片表框 -->
+                                        <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 x:Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
+                                        <!--四个点 -->
+                                        <Canvas>
+                                            <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                        </Canvas>
+                                    </Grid>
+                                </Border>
                             </Grid>
                             <Image x:Name="imgDocumentation" Visibility="Visible" Stretch="Fill"/>
                             <!--<Grid Width="auto" Height="auto" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -338,11 +338,11 @@
                                 </Border>
                             </Grid>-->
                             <Image x:Name="imgPPT" Visibility="Visible" VerticalAlignment="Top"/>
-                        <!--导入图片-->
-                        <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
-                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>
-                        <!--摄像头-->
-                        <!--<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">
+                            <!--导入图片-->
+                            <!--<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"
@@ -438,14 +438,16 @@
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                        <Border.Background>#EBEFF3</Border.Background>
+                                        <Border.Background>
+                                            <Brush>#EBEFF3</Brush>
+                                        </Border.Background>
                                         <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
+                                    Content="{TemplateBinding Content}" />
                                     </Border>
                                 </ControlTemplate>
                             </Button.Template>
@@ -471,14 +473,16 @@
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                    <Border.Background>#2D8CF0</Border.Background>
+                                    <Border.Background>
+                                        <Brush>#2D8CF0</Brush>
+                                    </Border.Background>
                                     <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
+                                    Content="{TemplateBinding Content}" />
                                 </Border>
                             </ControlTemplate>
                         </Button.Template>
@@ -553,11 +557,9 @@
                     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>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                </StackPanel>
                             </Button>
                             <Grid Width="60"  Background="Transparent">
                                 <Grid.RowDefinitions>
@@ -576,11 +578,9 @@
                     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>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                </StackPanel>
                             </Button>
                         </StackPanel>
                     </Grid>
@@ -645,11 +645,9 @@
                     Width="28" Height="20"
                     Click="last_button_Click">
 
-                            <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                                </StackPanel>
-                            </Button.Content>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                            </StackPanel>
                         </Button>
                         <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                             <Grid.RowDefinitions>
@@ -668,11 +666,9 @@
                     x:Name="next_btn"  Background="Transparent"
                     Width="28" Height="20"
                     Click="next_btn_Click">
-                            <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                                </StackPanel>
-                            </Button.Content>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                            </StackPanel>
                         </Button>
                     </StackPanel>
                 </Grid>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2776,6 +2776,8 @@ namespace XHWK.WKTool
         /// </summary>
         private void W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen()
         {
+            txbTime.Text = "";
+            txbTime.Visibility = Visibility.Hidden;
             txbType.Visibility = Visibility.Visible;
             txbType.Text = "保存中";
             btnScreenRecording.IsEnabled = false;
@@ -3326,8 +3328,6 @@ namespace XHWK.WKTool
                     //根据录制时间长度确定是否保存
                     if (SRTime.Hour > 0 || SRTime.Minute > 0 || SRTime.Second > 3)
                     {
-                        txbType.Visibility = Visibility.Visible;
-                        txbType.Text = "保存中";
                         #region 2秒内不可点击
                         new Thread(new ThreadStart(new Action(() =>
                         {
@@ -3359,6 +3359,8 @@ namespace XHWK.WKTool
                                 //End();
                                 txbTime.Text = "";
                                 txbTime.Visibility = Visibility.Hidden;
+                                txbType.Visibility = Visibility.Visible;
+                                txbType.Text = "保存中";
                             });
                             //}))).Start();
                             //new Thread(new ThreadStart(new Action(() =>
@@ -3455,9 +3457,6 @@ namespace XHWK.WKTool
                         timer.Dispose();
                         IsFirstR = true;
 
-
-
-
                         BtnRecord.IsEnabled = true;
                         btnStop.IsEnabled = true;
                         TxbRecordingWord.Text = "录制";