zhao：1修改录屏返回 2修改主页设置和我的页面切换

XHWK.WKTool/PrintWindow.xaml.cs

@@ -285,7 +285,14 @@ namespace XHWK.WKTool
         /// <returns></returns>
         public void InvokeServerCompate(object obj)
         {
-            APP.myloading.Hide();
+            try
+            {
+                GC.Collect();
+                APP.myloading.Hide();
+            }
+            catch (Exception)
+            {
+            }
         }
         /// <summary>
         /// 时钟回调

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -105,8 +105,6 @@ namespace XHWK.WKTool
             gridToolbar.Visibility = Visibility.Hidden;
             gridColour.Visibility = Visibility.Hidden;
             gridThickness.Visibility = Visibility.Hidden;
-            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-            btnReturn.IsEnabled = true;//返回主界面可点击
             ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
@@ -350,13 +348,7 @@ namespace XHWK.WKTool
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
                 txbTime.Visibility = Visibility.Visible;//时间显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
-
-                btnReturn.IsEnabled = false;//返回主界面可点击
-
-
-
                 //borOne.Background = new SolidColorBrush(Colors.LightBlue);
-
                 //btnReturn.IsEnabled = false;//返回主界面可点击
 
                 try
@@ -415,7 +407,7 @@ namespace XHWK.WKTool
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-                btnReturn.IsEnabled = true;//返回主界面可点击
+                //btnReturn.IsEnabled = true;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -551,8 +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)
@@ -832,8 +825,10 @@ namespace XHWK.WKTool
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
 
+            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

@@ -619,15 +619,15 @@
                 </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="Visible">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="50"/>
                 </Grid.RowDefinitions>
                 <Label x:Name="lblVideoMess" Grid.Row="0" Content="暂无微课录制信息，请录制并等待保存完成后重试！" HorizontalAlignment="Center" Margin="0,0,0,100" VerticalAlignment="Center" FontSize="20" Visibility="Hidden"/>
-                <Button x:Name="BtnVideoUpPage" Content="上一页" HorizontalAlignment="Center" Margin="0,0,150,10" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoUpPage_Click"/>
+                <Button x:Name="BtnVideoUpPage" Content="上一页" HorizontalAlignment="Center" Margin="0,0,150,12" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoUpPage_Click"/>
                 <Label x:Name="lblVideoPageNum" Grid.Row="1" FontSize="14" Content="100/100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Foreground="#FF333333" />
-                <Button x:Name="BtnVideoDownPage" Content="下一页" HorizontalAlignment="Center" Margin="150,0,0,10" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoDownPage_Click"/>
+                <Button x:Name="BtnVideoDownPage" Content="下一页" HorizontalAlignment="Center" Margin="150,0,0,12" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoDownPage_Click"/>
             </Grid>
 
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -470,7 +470,8 @@ namespace XHWK.WKTool
                 {
                     GridMain.Visibility = Visibility.Collapsed;
                     gridSetUp.Visibility = Visibility.Visible;
-                    gridUpload.Visibility = Visibility.Collapsed;
+                    //gridUpload.Visibility = Visibility.Collapsed;
+                    GridMyVideo.Visibility = Visibility.Collapsed;
                     txbStoragePath.Content = APP.WKData.WkPath;
 
                     #region 读取用户配置
@@ -548,7 +549,8 @@ namespace XHWK.WKTool
                 {
                     GridMain.Visibility = Visibility.Visible;
                     gridSetUp.Visibility = Visibility.Collapsed;
-                    gridUpload.Visibility = Visibility.Collapsed;
+                    //gridUpload.Visibility = Visibility.Collapsed;
+                    GridMyVideo.Visibility = Visibility.Collapsed;
                     if (APP.pageData.pagenum > 0)
                     {
                         gridPage.Visibility = Visibility.Visible;
@@ -1669,6 +1671,7 @@ namespace XHWK.WKTool
             }
             else
             {
+                gridSetUp.Visibility = Visibility.Collapsed;
                 gridPage.Visibility = Visibility.Collapsed;
                 GridMyVideo.Visibility = Visibility.Visible;
                 GridMain.Visibility = Visibility.Collapsed;
@@ -4671,7 +4674,8 @@ namespace XHWK.WKTool
         {
             GridMain.Visibility = Visibility.Visible;
             gridSetUp.Visibility = Visibility.Collapsed;
-            gridUpload.Visibility = Visibility.Collapsed;
+            //gridUpload.Visibility = Visibility.Collapsed;
+            GridMyVideo.Visibility = Visibility.Collapsed;
             if (APP.pageData.pagenum > 0)
             {
                 gridPage.Visibility = Visibility.Visible;