Browse Source

导入修复 上传按钮

tags/录制修改前
zhangxueyang 4 years ago
parent
commit
34c10f33c7

+ 2
- 2
XHWK.Model/Properties/AssemblyInfo.cs View File

31
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
31
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
32
 //通过使用 "*",如下所示:
32
 //通过使用 "*",如下所示:
33
 // [assembly: AssemblyVersion("1.0.*")]
33
 // [assembly: AssemblyVersion("1.0.*")]
34
-[assembly: AssemblyVersion("1.1.5.0")]
35
-[assembly: AssemblyFileVersion("1.1.5.0")]
34
+[assembly: AssemblyVersion("1.1.6.0")]
35
+[assembly: AssemblyFileVersion("1.1.6.0")]

+ 2
- 2
XHWK.WKTool/App.config View File

33
     <!--上传每片大小 Mb-->
33
     <!--上传每片大小 Mb-->
34
     <add key="UploadSliceLen" value="1" />
34
     <add key="UploadSliceLen" value="1" />
35
     <!--版本号-->
35
     <!--版本号-->
36
-    <add key="VersionCode" value="16" />
37
-    <add key="VersionName" value="1.1.5" />
36
+    <add key="VersionCode" value="17" />
37
+    <add key="VersionName" value="1.1.6" />
38
     <add key="ClientSettingsProvider.ServiceUri" value="" />
38
     <add key="ClientSettingsProvider.ServiceUri" value="" />
39
   </appSettings>
39
   </appSettings>
40
   <system.web>
40
   <system.web>

BIN
XHWK.WKTool/Images/Toobar30.png View File


+ 1
- 0
XHWK.WKTool/PracticeWindow.xaml.cs View File

385
             {
385
             {
386
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
386
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
387
             }
387
             }
388
+            blackboard_canvas.Strokes.Clear();
388
             APP.W_ScreenRecordingToolbarWindow.ReturnPractice();
389
             APP.W_ScreenRecordingToolbarWindow.ReturnPractice();
389
             //Hide();
390
             //Hide();
390
         }
391
         }

+ 2
- 2
XHWK.WKTool/Properties/AssemblyInfo.cs View File

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

+ 2
- 4
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

543
                 Directory.CreateDirectory(tempPath);
543
                 Directory.CreateDirectory(tempPath);
544
             }
544
             }
545
             string imagePath = Path.Combine(tempPath, time + ".jpg");
545
             string imagePath = Path.Combine(tempPath, time + ".jpg");
546
-            this.Hide();
546
+
547
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
547
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
548
-            this.Show();
548
+
549
             try
549
             try
550
             {
550
             {
551
                 if (flg == 11)
551
                 if (flg == 11)
826
             }
826
             }
827
             string imagePath = Path.Combine(tempPath, time + ".jpg");
827
             string imagePath = Path.Combine(tempPath, time + ".jpg");
828
 
828
 
829
-            this.Hide();
830
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
829
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
831
-            this.Show();
832
             try
830
             try
833
             {
831
             {
834
                 if (flg == 10)
832
                 if (flg == 10)

+ 11
- 5
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

1154
                         }
1154
                         }
1155
                             catch (Exception ex)
1155
                             catch (Exception ex)
1156
                             {
1156
                             {
1157
-                                MessageWindow.Show("文件无效或者文件被加密!");
1157
+                            Dispatcher.Invoke(new Action(() =>
1158
+                            {
1159
+                                MessageWindow.Show("文件无效或处于打开状态!");
1160
+                            }));
1161
+                            
1158
                                 LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
1162
                                 LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
1159
                             }
1163
                             }
1160
                         }
1164
                         }
1248
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
1252
                                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
1249
                                 btnScreenshot.IsEnabled = true;
1253
                                 btnScreenshot.IsEnabled = true;
1250
                             }
1254
                             }
1251
-                            APP.myloading.Hide();
1252
-                        }
1255
+                    }
1253
                         else//word
1256
                         else//word
1254
                         {
1257
                         {
1255
                             try
1258
                             try
1316
                         }
1319
                         }
1317
                             catch (Exception ex)
1320
                             catch (Exception ex)
1318
                             {
1321
                             {
1319
-                                APP.myloading.Hide();
1320
-                                LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
1322
+                            Dispatcher.Invoke(new Action(() =>
1323
+                            {
1324
+                                MessageWindow.Show("文件无效或处于打开状态!");
1325
+                            }));
1326
+                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
1321
                             }
1327
                             }
1322
                         }
1328
                         }
1323
                     }
1329
                     }

Loading…
Cancel
Save