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

XHWK.WKTool/App.config

@@ -34,8 +34,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="28" />
-    <add key="VersionName" value="1.2.7" />
+    <add key="VersionCode" value="29" />
+    <add key="VersionName" value="1.2.8" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -127,6 +127,7 @@ namespace ComeCapture
                 k_hook.Stop();
                 Current.OnCancel();
                 APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
+                APP.W_XHMicroLessonSystemWindow.WindowType();
                 this.Hide();
             }
         }

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -75,41 +75,43 @@ namespace XHWK.WKTool
         public ScreenRecordingToolbarWindow()
         {
             InitializeComponent();
-            if (APP.W_PracticeWindow == null)
-            {
-                APP.W_PracticeWindow = new PracticeWindow
-                {
-                    //APP.W_PracticeWindow.Topmost = true;
-                    Width = pwidth,
-                    Height = pHeight,
-                    Left = 0,
-                    Top = 0
-                };
-                //practiceWin.Owner = this;
-            }
-            APP.W_PracticeWindow.Show();
-            new Thread(new ThreadStart(new Action(() =>
-            {
-                Thread.Sleep(100);
-                Dispatcher.Invoke(() =>
-                {
-                    this.Owner = APP.W_PracticeWindow;
-                    this.Topmost = true;
-                });
-            }))).Start();
-            APP.W_PracticeWindow.Hide();
+            this.ResizeMode = ResizeMode.NoResize;
         }
         /// <summary>
         /// 初始化
         /// </summary>
         public void Initialize()
         {
+                if (APP.W_PracticeWindow == null)
+                {
+                    APP.W_PracticeWindow = new PracticeWindow
+                    {
+                        //APP.W_PracticeWindow.Topmost = true;
+                        Width = pwidth,
+                        Height = pHeight,
+                        Left = 0,
+                        Top = 0
+                    };
+                    //practiceWin.Owner = this;
+                }
+                APP.W_PracticeWindow.Show();
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(100);
+                    Dispatcher.Invoke(() =>
+                    {
+                        this.Owner = APP.W_PracticeWindow;
+                        this.Topmost = true;
+                    });
+                }))).Start();
+                APP.W_PracticeWindow.Hide();
+            
             //timer = new System.Timers.Timer(200);
             //timer.Interval = 300;
             //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
             //timer.Enabled = true; //启动计时器
 
-                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+            borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
                 borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
             flg = 0;
          
@@ -512,7 +514,7 @@ namespace XHWK.WKTool
                 if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
                 {
                     this.Owner = null;
-                    APP.W_PracticeWindow.Hide();
+                    APP.W_PracticeWindow.ReturnPractice();
                 }
             }
             if (gridToolbar.Visibility == Visibility.Visible)
@@ -1086,6 +1088,7 @@ namespace XHWK.WKTool
 
                 txbTime.Visibility = Visibility.Hidden;
                 End();
+                APP.W_PracticeWindow.ReturnPractice();
                 if (APP.W_PracticeWindow != null)
                 {
                     if (APP.W_PracticeWindow.Visibility == Visibility.Visible)

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -69,7 +69,7 @@ namespace XHWK.WKTool.UControl
             string videoName = FileToolsCommon.GetIOFileNameNoExtension(VideoModel.VideoPath);
             TbName.Text = videoName.Length > 11 ? videoName.Substring(0, 11) + "..." : videoName;
             TbName.ToolTip = videoName;
-            lblDateSize.Content = VideoModel.RSTime + "|" + VideoModel.VideoSize;
+            lblDateSize.Content = VideoModel.RSTime + " " + VideoModel.VideoSize;
             if (VideoModel.IsUpload)
             {
                 //BtnUpload.Visibility = Visibility.Hidden;

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -938,6 +938,14 @@ namespace XHWK.WKTool
 
             //imgCanvas.Source = new BitmapImage(new Uri(desktopPath));
         }
+        public void WindowType()
+        {
+            if (WindowState == WindowState.Minimized)//截图完恢复窗口
+            {
+                Topmost = true;
+                WindowState = WindowState.Normal;
+            }
+        }
         /// <summary>
         /// 截图关闭窗口
         /// </summary>
@@ -992,6 +1000,7 @@ namespace XHWK.WKTool
                         imgCanvas.Source = bitImg;
                         imgCanvas.Width = bitImg.Width;
                         imgCanvas.Height = bitImg.Height;
+                        scroMain.ScrollToVerticalOffset(0);
                         APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform
                         {
                             CenterX = imgCanvas.Width,
@@ -1042,8 +1051,8 @@ namespace XHWK.WKTool
                 string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
                 ofd = new System.Windows.Forms.OpenFileDialog
                 {
-                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
-                    //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
+                    //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
+                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
                     InitialDirectory = desktopPath,
                     Multiselect = false,
                     AddExtension = true,
@@ -1197,6 +1206,7 @@ namespace XHWK.WKTool
                                     btnScreenshot.IsEnabled = false;
                                     imgDocumentation.Source = null;
                                     imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                    scroMain.ScrollToVerticalOffset(0);
                                     for (int i = iStart; i < iEnd; i++)
                                     {
                                         APP.PageDrawList[i].ImageLocation = new TranslateTransform
@@ -1328,6 +1338,7 @@ namespace XHWK.WKTool
                                     btnScreenshot.IsEnabled = false;
                                     imgDocumentation.Source = null;
                                     imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                    scroMain.ScrollToVerticalOffset(0);
                                     for (int i = iStart; i < iEnd; i++)
                                     {
                                         APP.PageDrawList[i].ImageLocation = new TranslateTransform
@@ -1420,6 +1431,7 @@ namespace XHWK.WKTool
                                     btnScreenshot.IsEnabled = false;
                                     imgDocumentation.Visibility = Visibility.Visible;
                                     imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                    scroMain.ScrollToVerticalOffset(0);
                                 }
                                 else
                                 {
@@ -3499,6 +3511,7 @@ namespace XHWK.WKTool
             gridPage.Visibility = Visibility.Visible;//页码大于0 显示
             APP.pageData.currpage = APP.pageData.pagenum;
             myblackboard.changepage(APP.pageData.currpage - 1);
+            scroMain.ScrollToVerticalOffset(0);
             ///清空页面图片UI
             imgCanvas.Source = null;
             imgDocumentation.Source = null;