导入修复 上传按钮

XHWK.Model/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [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/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <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>

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/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

@@ -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/XHMicroLessonSystemWindow.xaml.cs

@@ -1154,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);
                             }
                         }
@@ -1248,8 +1252,7 @@ namespace XHWK.WKTool
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                 btnScreenshot.IsEnabled = true;
                             }
-                            APP.myloading.Hide();
-                        }
+                    }
                         else//word
                         {
                             try
@@ -1316,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);
                             }
                         }
                     }