Browse Source

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

tags/录制修改前
耀 4 years ago
parent
commit
c5c87ff705

+ 8
- 1
XHWK.WKTool/PrintWindow.xaml.cs View File

285
         /// <returns></returns>
285
         /// <returns></returns>
286
         public void InvokeServerCompate(object obj)
286
         public void InvokeServerCompate(object obj)
287
         {
287
         {
288
-            APP.myloading.Hide();
288
+            try
289
+            {
290
+                GC.Collect();
291
+                APP.myloading.Hide();
292
+            }
293
+            catch (Exception)
294
+            {
295
+            }
289
         }
296
         }
290
         /// <summary>
297
         /// <summary>
291
         /// 时钟回调
298
         /// 时钟回调

+ 6
- 11
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

105
             gridToolbar.Visibility = Visibility.Hidden;
105
             gridToolbar.Visibility = Visibility.Hidden;
106
             gridColour.Visibility = Visibility.Hidden;
106
             gridColour.Visibility = Visibility.Hidden;
107
             gridThickness.Visibility = Visibility.Hidden;
107
             gridThickness.Visibility = Visibility.Hidden;
108
-            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
109
-            btnReturn.IsEnabled = true;//返回主界面可点击
110
             ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
108
             ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
111
             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
109
             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
112
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
110
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
350
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
348
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
351
                 txbTime.Visibility = Visibility.Visible;//时间显示
349
                 txbTime.Visibility = Visibility.Visible;//时间显示
352
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
350
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
353
-
354
-                btnReturn.IsEnabled = false;//返回主界面可点击
355
-
356
-
357
-
358
                 //borOne.Background = new SolidColorBrush(Colors.LightBlue);
351
                 //borOne.Background = new SolidColorBrush(Colors.LightBlue);
359
-
360
                 //btnReturn.IsEnabled = false;//返回主界面可点击
352
                 //btnReturn.IsEnabled = false;//返回主界面可点击
361
 
353
 
362
                 try
354
                 try
415
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
407
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
416
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
408
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
417
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
409
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
418
-                btnReturn.IsEnabled = true;//返回主界面可点击
410
+                //btnReturn.IsEnabled = true;//返回主界面可点击
419
                 #region 2秒内不可点击
411
                 #region 2秒内不可点击
420
                 new Thread(new ThreadStart(new Action(() =>
412
                 new Thread(new ThreadStart(new Action(() =>
421
                 {
413
                 {
551
                 Directory.CreateDirectory(tempPath);
543
                 Directory.CreateDirectory(tempPath);
552
             }
544
             }
553
             string imagePath = Path.Combine(tempPath, time + ".jpg");
545
             string imagePath = Path.Combine(tempPath, time + ".jpg");
546
+            this.Hide();
554
             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);
555
-
548
+            this.Show();
556
             try
549
             try
557
             {
550
             {
558
                 if (flg == 11)
551
                 if (flg == 11)
832
                 Directory.CreateDirectory(tempPath);
825
                 Directory.CreateDirectory(tempPath);
833
             }
826
             }
834
             string imagePath = Path.Combine(tempPath, time + ".jpg");
827
             string imagePath = Path.Combine(tempPath, time + ".jpg");
835
-            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
836
 
828
 
829
+            this.Hide();
830
+            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
831
+            this.Show();
837
             try
832
             try
838
             {
833
             {
839
                 if (flg == 10)
834
                 if (flg == 10)

+ 3
- 3
XHWK.WKTool/XHMicroLessonSystemWindow.xaml View File

619
                 </Border>
619
                 </Border>
620
             </Grid>
620
             </Grid>
621
 
621
 
622
-            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Hidden">
622
+            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Visible">
623
                 <Grid.RowDefinitions>
623
                 <Grid.RowDefinitions>
624
                     <RowDefinition Height="*"/>
624
                     <RowDefinition Height="*"/>
625
                     <RowDefinition Height="50"/>
625
                     <RowDefinition Height="50"/>
626
                 </Grid.RowDefinitions>
626
                 </Grid.RowDefinitions>
627
                 <Label x:Name="lblVideoMess" Grid.Row="0" Content="暂无微课录制信息,请录制并等待保存完成后重试!" HorizontalAlignment="Center" Margin="0,0,0,100" VerticalAlignment="Center" FontSize="20" Visibility="Hidden"/>
627
                 <Label x:Name="lblVideoMess" Grid.Row="0" Content="暂无微课录制信息,请录制并等待保存完成后重试!" HorizontalAlignment="Center" Margin="0,0,0,100" VerticalAlignment="Center" FontSize="20" Visibility="Hidden"/>
628
-                <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"/>
628
+                <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"/>
629
                 <Label x:Name="lblVideoPageNum" Grid.Row="1" FontSize="14" Content="100/100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Foreground="#FF333333" />
629
                 <Label x:Name="lblVideoPageNum" Grid.Row="1" FontSize="14" Content="100/100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Foreground="#FF333333" />
630
-                <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"/>
630
+                <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"/>
631
             </Grid>
631
             </Grid>
632
 
632
 
633
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
633
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">

+ 7
- 3
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

470
                 {
470
                 {
471
                     GridMain.Visibility = Visibility.Collapsed;
471
                     GridMain.Visibility = Visibility.Collapsed;
472
                     gridSetUp.Visibility = Visibility.Visible;
472
                     gridSetUp.Visibility = Visibility.Visible;
473
-                    gridUpload.Visibility = Visibility.Collapsed;
473
+                    //gridUpload.Visibility = Visibility.Collapsed;
474
+                    GridMyVideo.Visibility = Visibility.Collapsed;
474
                     txbStoragePath.Content = APP.WKData.WkPath;
475
                     txbStoragePath.Content = APP.WKData.WkPath;
475
 
476
 
476
                     #region 读取用户配置
477
                     #region 读取用户配置
548
                 {
549
                 {
549
                     GridMain.Visibility = Visibility.Visible;
550
                     GridMain.Visibility = Visibility.Visible;
550
                     gridSetUp.Visibility = Visibility.Collapsed;
551
                     gridSetUp.Visibility = Visibility.Collapsed;
551
-                    gridUpload.Visibility = Visibility.Collapsed;
552
+                    //gridUpload.Visibility = Visibility.Collapsed;
553
+                    GridMyVideo.Visibility = Visibility.Collapsed;
552
                     if (APP.pageData.pagenum > 0)
554
                     if (APP.pageData.pagenum > 0)
553
                     {
555
                     {
554
                         gridPage.Visibility = Visibility.Visible;
556
                         gridPage.Visibility = Visibility.Visible;
1669
             }
1671
             }
1670
             else
1672
             else
1671
             {
1673
             {
1674
+                gridSetUp.Visibility = Visibility.Collapsed;
1672
                 gridPage.Visibility = Visibility.Collapsed;
1675
                 gridPage.Visibility = Visibility.Collapsed;
1673
                 GridMyVideo.Visibility = Visibility.Visible;
1676
                 GridMyVideo.Visibility = Visibility.Visible;
1674
                 GridMain.Visibility = Visibility.Collapsed;
1677
                 GridMain.Visibility = Visibility.Collapsed;
4671
         {
4674
         {
4672
             GridMain.Visibility = Visibility.Visible;
4675
             GridMain.Visibility = Visibility.Visible;
4673
             gridSetUp.Visibility = Visibility.Collapsed;
4676
             gridSetUp.Visibility = Visibility.Collapsed;
4674
-            gridUpload.Visibility = Visibility.Collapsed;
4677
+            //gridUpload.Visibility = Visibility.Collapsed;
4678
+            GridMyVideo.Visibility = Visibility.Collapsed;
4675
             if (APP.pageData.pagenum > 0)
4679
             if (APP.pageData.pagenum > 0)
4676
             {
4680
             {
4677
                 gridPage.Visibility = Visibility.Visible;
4681
                 gridPage.Visibility = Visibility.Visible;

Loading…
Cancel
Save