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

# Conflicts:
#	XHWK.WKTool/UControl/Uc_VideoItem.xaml

XHWK.Model/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.6.0")]
+[assembly: AssemblyFileVersion("1.1.6.0")]

XHWK.WKTool/App.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1"/>
+    <add key="IsDebug" value="1" />
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
@@ -13,27 +13,40 @@
     <!--视频格式 1、MP4 2、FlV 3、AVI-->
     <add key="VideoType" value="1" />
     <!--声音 true 有 false 无-->
-    <add key="IsSound" value="true"/>
+    <add key="IsSound" value="true" />
     <!--图片压缩质量-->
-    <add key="ImageCompressionLevel" value="50"/>
+    <add key="ImageCompressionLevel" value="50" />
     <!--用户名-->
     <add key="userName" value="" />
     <!--记住密码-->
     <add key="isRemind" value="" />
     <!--API请求地址-->
-    <add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com"/>
+    <add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com" />
     <!--文件平台请求地址-->
-    <add key="FileRequestAddress" value="http://schoolfile.xhkjedu.com"/>
+    <add key="FileRequestAddress" value="http://schoolfile.xhkjedu.com" />
     <!--展示文件服务器请求地址-->
-    <add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com"/>
+    <add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com" />
     <!--认证请求地址-->
-    <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com"/>
+    <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com" />
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
-    <add key="CameraPosition" value="1"/>
+    <add key="CameraPosition" value="1" />
     <!--上传每片大小 Mb-->
-    <add key="UploadSliceLen" value="1"/>
+    <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="16"/>
-    <add key="VersionName" value="1.1.5"/>
+    <add key="VersionCode" value="17" />
+    <add key="VersionName" value="1.1.6" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
 </configuration>

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -23,22 +23,22 @@
         <Border Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Grid.ColumnSpan="2">
             <Grid>
                 <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="28" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
             </Grid>
         </Border>
         <!--第二行 讲解名称-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,1" Grid.ColumnSpan="2">
-            <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
-            <TextBlock Text="讲解名称" FontSize="18" Padding="2,15,10,0"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,40,0,1" Grid.ColumnSpan="2">
+            <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
+            <TextBlock Text="讲解名称" FontSize="18" Padding="2,23,10,0"/>
             <!--输入框-->
             <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
                 <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 存放路径-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,1" Grid.ColumnSpan="2">
-            <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
-            <TextBlock Text="存放路径" FontSize="18" Padding="2,15,10,0"/>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,10,0,1" Grid.ColumnSpan="2">
+            <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
+            <TextBlock Text="存放路径" FontSize="18" Padding="2,23,10,0"/>
             <!--输入框-->
             <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
                 <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
@@ -62,13 +62,13 @@
             </Button>
         </StackPanel>
         <!--第四行 开始按钮-->
-        <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click" Grid.ColumnSpan="2">
+        <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="48" Margin="10,0,10,0" Click="BtnStart_Click" Grid.ColumnSpan="2">
             <Button.Template>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
-                                CornerRadius="2">
+                                CornerRadius="3">
                         <Border.Background>#2D8CF0</Border.Background>
                         <ContentPresenter
                                     HorizontalAlignment="Center"

XHWK.WKTool/KeyVerification.xaml.cs

@@ -64,11 +64,12 @@ namespace XHWK.WKTool
                 APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
                 Dispatcher.Invoke(new Action(() =>
                 {
+                    Hide();
                     CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
                     //win.Topmost = true;
                     win.Show();
 
-                    Hide();
+                    
                     Thread.Sleep(200);
                     Close();
                 }));

XHWK.WKTool/LoginWindow.xaml

@@ -17,8 +17,8 @@
         <!--分5行-->
         <Grid.RowDefinitions>
             <RowDefinition Height="45"/>
-            <RowDefinition Height="70"/>
-            <RowDefinition Height="70"/>
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="80"/>
             <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
@@ -30,19 +30,19 @@
             </Grid>
         </Border>
         <!--第二行 登陆 账号-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,30,0,0">
             <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
-            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3" Margin="0,0,0,1">
-                <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            <Border Background="#cccbce" Width="369" Height="43" CornerRadius="3" Margin="0,0,0,1">
+                <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="367" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 密码-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,1">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,30,0,1">
             <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
-            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
-                <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            <Border Background="#cccbce" Width="369" Height="43" CornerRadius="3">
+                <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="367" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,10,0,0">
@@ -53,13 +53,13 @@
         </StackPanel>
 
         <!--第五行 开始按钮-->
-        <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="50" Margin="10,0,10,0" Click="BtnStart_Click">
+        <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" FontWeight="Bold" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="48" Margin="10,0,10,0" Click="BtnStart_Click">
             <Button.Template>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
-                                CornerRadius="7">
+                                CornerRadius="3">
                         <Border.Background>#2D8CF0</Border.Background>
                         <ContentPresenter
                                     HorizontalAlignment="Center"

XHWK.WKTool/MessageWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d" 
         Title="星火微课" WindowStartupLocation="CenterScreen"
     WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
-    ShowInTaskbar="False" Topmost="True" ResizeMode="NoResize" 
+    ShowInTaskbar="False"  Topmost="True" ResizeMode="NoResize" 
         d:DesignHeight="250" Width="600" Height="220"  MouseMove="Window_MouseMove"  BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
@@ -19,17 +19,17 @@
             <RowDefinition Height="70"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
-            <Label x:Name="lblTitle" Content="提示" HorizontalAlignment="Left" Margin="14,20,0,0" VerticalAlignment="Top" Foreground="#FF333333" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" FontSize="17" FontWeight="Bold"/>
+            <Label x:Name="lblTitle" Content="提示" HorizontalAlignment="Left" Margin="14,10,0,0" VerticalAlignment="Top" Foreground="#FF333333" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" FontSize="20" FontWeight="Bold"/>
         </Grid>
         <Grid Grid.Row="1">
-            <TextBlock x:Name="tbkContent" Margin="20,5,20,0" TextWrapping="Wrap" VerticalAlignment="Center" FontSize="15" Foreground="#FF919191" Grid.Row="1" HorizontalAlignment="Center" Text=""/>
+            <TextBlock x:Name="tbkContent" Margin="20,0,20,0" TextWrapping="Wrap" VerticalAlignment="Center" FontSize="20" Foreground="#FF919191" Grid.Row="1" HorizontalAlignment="Center" Text=""/>
         </Grid>
         <Grid Grid.Row="2" Margin="0,0,0,0">
             <Border x:Name="borOk" Background="#2D8CF0" CornerRadius="6" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,30,20">
-                <Button x:Name="BtnOK" Width="104" Height="42" Content="确定" FontSize="17"  Background="#00000000"  BorderBrush="{x:Null}" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Foreground="White"  Cursor="Hand" Click="BtnOK_Click"/>
+                <Button x:Name="BtnOK" Width="104" Height="42" Content="确定" FontSize="20"  Background="#00000000"  BorderBrush="{x:Null}" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Foreground="White"  Cursor="Hand" Click="BtnOK_Click"/>
             </Border>
             <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6"  HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,150,20">
-                <Button x:Name="BtnCancel" Width="104" Height="42" Content="取消" FontSize="17" Background="#00000000" BorderBrush="{x:Null}"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Cursor="Hand" Click="BtnCancel_Click"/>
+                <Button x:Name="BtnCancel" Width="104" Height="42" Content="取消" FontSize="20" Background="#00000000" BorderBrush="{x:Null}"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Cursor="Hand" Click="BtnCancel_Click"/>
             </Border>
         </Grid>
 

XHWK.WKTool/MessageWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -385,6 +385,7 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
+            blackboard_canvas.Strokes.Clear();
             APP.W_ScreenRecordingToolbarWindow.ReturnPractice();
             //Hide();
         }

XHWK.WKTool/ProductVerification.xaml.cs

@@ -73,6 +73,7 @@ namespace XHWK.WKTool
                     }
                     Dispatcher.Invoke(new Action(() =>
                     {
+                        this.Hide();
                         CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
                         win.Show();
                         Close();
@@ -82,6 +83,7 @@ namespace XHWK.WKTool
                 {
                     Dispatcher.Invoke(new Action(() =>
                     {
+                        this.Hide();
                         KeyVerification wins = new KeyVerification
                         {
                             Topmost = true
@@ -96,6 +98,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("ProductVerification(解析失败)" + ex.Message, ex);
                 Dispatcher.Invoke(new Action(() =>
                 {
+                    this.Hide();
                     KeyVerification wins = new KeyVerification
                     {
                         Topmost = true

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.5.0")]
-[assembly: AssemblyFileVersion("1.1.5.0")]
+[assembly: AssemblyVersion("1.1.6.0")]
+[assembly: AssemblyFileVersion("1.1.6.0")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -88,7 +88,7 @@ namespace XHWK.WKTool
 
                 borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
                 borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-
+            flg = 0;
 
 
             k_hook = new KeyboardHookCommon();
@@ -543,9 +543,9 @@ namespace XHWK.WKTool
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            this.Hide();
+
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
-            this.Show();
+
             try
             {
                 if (flg == 11)
@@ -826,9 +826,7 @@ namespace XHWK.WKTool
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
 
-            this.Hide();
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
-            this.Show();
             try
             {
                 if (flg == 10)

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:XHWK.WKTool.UControl"
              mc:Ignorable="d" 
-             d:DesignHeight="270" d:DesignWidth="250">
+             d:DesignHeight="260" d:DesignWidth="250">
     <Grid>
         <Button x:Name="BtnVideoPlay" HorizontalAlignment="Center" Width="200" Height="130" Margin="25,10,25,0" VerticalAlignment="Top" Cursor="Hand" Click="BtnVideoPlay_Click">
             <Image x:Name="ImgVideo" VerticalAlignment="Top"  Width="200" Height="130" Margin="0,0,0,0" Cursor="Hand" Stretch="Fill"/>
@@ -29,9 +29,16 @@
             </Button.Resources>
             <Image Source="/星火微课;component/Images/VideoList_OK.png"></Image>
         </Button>
-        <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" HorizontalAlignment="Center" Margin="0,180,0,0" VerticalAlignment="Top" Height="30" Width="240" Foreground="#FF9A9A9A" FontSize="13" HorizontalContentAlignment="Center"/>
-        <Button x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left" Margin="25,220,0,0" VerticalAlignment="Top" Width="90" Height="34" Background="#FF3492F4" Foreground="White" FontSize="18" Click="BtnUpload_Click"/>
-        <Button x:Name="BtnDelVideo" Content="删除" HorizontalAlignment="Right" Margin="0,220,25,0" VerticalAlignment="Top" Width="90" Height="34" Foreground="White" FontSize="18" Background="#FFF0582C" Click="BtnDelVideo_Click"/>
 
+        <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" HorizontalAlignment="Center" Margin="0,175,0,0" VerticalAlignment="Top" Height="30" Width="240" Foreground="#FF9A9A9A" FontSize="13" HorizontalContentAlignment="Center"/>
+        <Border x:Name="BorUploadBtn" CornerRadius="3" HorizontalAlignment="Left" Margin="25,210,0,0" VerticalAlignment="Top" Width="90" Height="40" Background="#FF3492F4">
+            <Button x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left"  Width="90" Height="40" Foreground="White" FontSize="18" Click="BtnUpload_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"/>
+        </Border>
+        <Border CornerRadius="3" Width="90" Height="40" Background="#FFF0582C" HorizontalAlignment="Right" Margin="0,210,25,0" VerticalAlignment="Top">
+
+            <Button x:Name="BtnDelVideo" Content="删除"  Width="90" Height="40" Foreground="White" FontSize="18" Background="Transparent" Click="BtnDelVideo_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+      
+        </Button>
+        </Border>
     </Grid>
 </UserControl>

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -75,7 +75,7 @@ namespace XHWK.WKTool.UControl
             if (VideoModel.IsUpload)
             {
                 //BtnUpload.Visibility = Visibility.Hidden;
-                BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                BorUploadBtn.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#DDDDDD"));
                 BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
                 BtnUpload.IsEnabled = false;
             }
@@ -355,7 +355,7 @@ namespace XHWK.WKTool.UControl
             {
                 W_UploadWindow.Close();
                 //BtnUpload.Visibility = Visibility.Hidden;
-                BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                BorUploadBtn.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#DDDDDD"));
                 BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
                 BtnUpload.IsEnabled = false;
             }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -216,7 +216,7 @@
 
                 <!--第二行-->
 
-                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0,0,5" HorizontalAlignment="Left">
+                <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"/>
@@ -279,7 +279,7 @@
                             <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">
+                    <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="Visible"/>
                             <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Collapsed"/>
@@ -619,7 +619,8 @@
                 </Border>
             </Grid>
 
-            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Hidden">
+
+            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Collapsed">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="50"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -933,16 +933,17 @@ namespace XHWK.WKTool
                             X = 0.1,
                             Y = 0.1
                         };
-                        APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform
-                        {
-                            CenterX = 475,
-                            CenterY = 538
-                        };
+                     
 
                         APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                         imgCanvas.Source = bitImg;
                         imgCanvas.Width = bitImg.Width;
                         imgCanvas.Height = bitImg.Height;
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform
+                        {
+                            CenterX = imgCanvas.Width,
+                            CenterY = imgCanvas.Height
+                        };
                         ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
                         ImgPrintTwo.Visibility = Visibility.Collapsed;
                         btnPrint.IsEnabled = true;
@@ -971,6 +972,8 @@ namespace XHWK.WKTool
         private void imgCanvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             imgCanvas.Source = null;
+            APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = null;
+            APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath = null;
         }
         /// <summary>
         /// 导入事件
@@ -1151,7 +1154,11 @@ namespace XHWK.WKTool
                         }
                             catch (Exception ex)
                             {
-                                MessageWindow.Show("文件无效或者文件被加密！");
+                            Dispatcher.Invoke(new Action(() =>
+                            {
+                                MessageWindow.Show("文件无效或处于打开状态！");
+                            }));
+                            
                                 LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
                             }
                         }
@@ -1245,8 +1252,7 @@ namespace XHWK.WKTool
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                 btnScreenshot.IsEnabled = true;
                             }
-                            APP.myloading.Hide();
-                        }
+                    }
                         else//word
                         {
                             try
@@ -1313,8 +1319,11 @@ namespace XHWK.WKTool
                         }
                             catch (Exception ex)
                             {
-                                APP.myloading.Hide();
-                                LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
+                            Dispatcher.Invoke(new Action(() =>
+                            {
+                                MessageWindow.Show("文件无效或处于打开状态！");
+                            }));
+                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                             }
                         }
                     }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -90,6 +90,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />