合并

XHWK.WKTool/LoginWindow.xaml

@@ -12,63 +12,62 @@
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
-    <Viewbox>
-        <Grid Height="358" Width="471" Background="#FFFFFF">
-            <!--分5行-->
-            <Grid.RowDefinitions>
-                <RowDefinition Height="45"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="50"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <!--第一行 标题-->
-            <Border Grid.Row="0" Background="#2D8CF0">
-                <Grid>
-                    <TextBlock Text="登录星火微课系统" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
-                </Grid>
+
+    <Grid Background="#FFFFFF">
+        <!--分5行-->
+        <Grid.RowDefinitions>
+            <RowDefinition Height="45"/>
+            <RowDefinition Height="70"/>
+            <RowDefinition Height="70"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <!--第一行 标题-->
+        <Border Grid.Row="0" Background="#2D8CF0">
+            <Grid>
+                <TextBlock Text="登录星火微课系统" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
+                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+            </Grid>
+        </Border>
+        <!--第二行 登陆 账号-->
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
+            <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
+            <!--输入框-->
+            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+                <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            </Border>
+        </StackPanel>
+        <!--第三行 密码-->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,0">
+            <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
+            <!--输入框-->
+            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+                <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
-            <!--第二行 登陆 账号-->
-            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
-                <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
-                <!--输入框-->
-                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
-                    <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
-                </Border>
-            </StackPanel>
-            <!--第三行 密码-->
-            <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,0">
-                <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
-                <!--输入框-->
-                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
-                    <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
-                </Border>
-            </StackPanel>
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,10,0,0">
-                <Viewbox Height="23">
-                    <CheckBox   x:Name="ckSaveName" Click="CkSaveName_Click"/>
-                </Viewbox>
-                <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0"/>
-            </StackPanel>
+        </StackPanel>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,10,0,0">
+            <Viewbox Height="23">
+                <CheckBox   x:Name="ckSaveName" Click="CkSaveName_Click"/>
+            </Viewbox>
+            <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0" Margin="0,9,0,1"/>
+        </StackPanel>
 
-            <!--第五行 开始按钮-->
-            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="50" Margin="10,0,10,0" Click="BtnStart_Click">
-                <Button.Template>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border
+        <!--第五行 开始按钮-->
+        <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="50" Margin="10,0,10,0" Click="BtnStart_Click">
+            <Button.Template>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="7">
-                            <Border.Background>#2D8CF0</Border.Background>
-                            <ContentPresenter
+                        <Border.Background>#2D8CF0</Border.Background>
+                        <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                        </Border>
-                    </ControlTemplate>
-                </Button.Template>
-            </Button>
-        </Grid>
-    </Viewbox>
+                    </Border>
+                </ControlTemplate>
+            </Button.Template>
+        </Button>
+    </Grid>
 </Window>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -350,13 +350,35 @@ 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
                 {
+                    #region 4秒内不可点击
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+                            BtnRecordingScreen.IsEnabled = false;
+                            BtnStopRecordingScreen.IsEnabled = false;
+                        });
+                        Thread.Sleep(4000);
+                        Dispatcher.Invoke(() =>
+                        {
+                            ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
+                            BtnRecordingScreen.IsEnabled = true;
+                            BtnStopRecordingScreen.IsEnabled = true;
+                        });
+                    }))).Start();
+                    #endregion
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         if (IsFirstRS)
@@ -386,7 +408,6 @@ namespace XHWK.WKTool
                 TimeOut();
                 IsSuspend = 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; //停止录制按钮不点击
                 imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
                 btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
@@ -394,12 +415,13 @@ 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(() =>
                 {
                     Dispatcher.Invoke(() =>
                     {
+                        ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
                         BtnRecordingScreen.IsEnabled = false;
                         BtnStopRecordingScreen.IsEnabled = false;
                     });
@@ -927,60 +949,36 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnReturn_Click(object sender, RoutedEventArgs e)
         {
-            MessageBoxResult br=MessageWindow.Show("退出将不保存当前录屏！", "提示", MessageBoxButton.OKCancel);
-            if(br==MessageBoxResult.Cancel)
-            {
-                return;
-            }
-            k_hook.Stop();
-            IsSuspend = true;
-            txbTime.Text = "00:00";
-
-            txbTime.Visibility = Visibility.Hidden;
-            End();
-            if (APP.W_PracticeWindow != null)
+            if (!IsFirstRS)
             {
-                if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
+                MessageBoxResult br = MessageWindow.Show("退出将不保存当前录屏！", "提示", MessageBoxButton.OKCancel);
+                if (br == MessageBoxResult.Cancel)
                 {
-                    APP.W_PracticeWindow.Hide();
+                    return;
                 }
-            }
-            if (gridToolbar.Visibility == Visibility.Visible)
-            {
-                gridToolbar.Visibility = Visibility.Hidden;
-                gridColour.Visibility = Visibility.Hidden;
-                gridThickness.Visibility = Visibility.Hidden;
-            }
-            if (APP.W_XHMicroLessonSystemWindow == null)
-            {
-                MessageBoxResult dr = MessageWindow.Show("返回主界面视频不保存，是否返回？", "提示", MessageBoxButton.OKCancel);
-                if (dr == MessageBoxResult.OK)
-                {
-                    IsSuspend = true;
-                    txbTime.Text = "00:00";
+                k_hook.Stop();
+                IsSuspend = true;
+                txbTime.Text = "00:00";
 
-                    txbTime.Visibility = Visibility.Hidden;
-                    End();
-                    if (APP.W_XHMicroLessonSystemWindow == null)
+                txbTime.Visibility = Visibility.Hidden;
+                End();
+                if (APP.W_PracticeWindow != null)
+                {
+                    if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
                     {
-                        APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                        APP.W_PracticeWindow.Hide();
                     }
-                    APP.W_XHMicroLessonSystemWindow.Show();
-                    Hide();
                 }
-            }
-            else
-            {
+                if (gridToolbar.Visibility == Visibility.Visible)
+                {
+                    gridToolbar.Visibility = Visibility.Hidden;
+                    gridColour.Visibility = Visibility.Hidden;
+                    gridThickness.Visibility = Visibility.Hidden;
+                }
                 if (APP.W_XHMicroLessonSystemWindow == null)
                 {
                     APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
                 }
-                APP.W_XHMicroLessonSystemWindow.Show();
-                Hide();
-            }
-            APP.W_XHMicroLessonSystemWindow.Show();
-            if (!IsFirstRS)
-            {
                 try
                 {
                     try
@@ -996,7 +994,7 @@ namespace XHWK.WKTool
                     {
                         VideoInfo = null;
                         FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temprs/");
-                        
+
                     }))).Start();
                 }
                 catch (Exception ex)
@@ -1004,6 +1002,7 @@ namespace XHWK.WKTool
                     LogHelper.WriteErrLog("【录屏返回】（BtnStopRecordingScreen_Click）" + ex.Message, ex);
                 }
             }
+            APP.W_XHMicroLessonSystemWindow.Show();
             Hide();
         }
     }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -261,8 +261,8 @@
                     </Button>-->
                 <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnUpload_Click">
                     <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
-                        <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
+                        <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_22.png" Visibility="Visible"/>
+                        <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_1.png" Visibility="Collapsed"/>
                         <TextBlock Text="我的" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                     </StackPanel>
                 </Button>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -423,11 +423,15 @@ namespace XHWK.WKTool
         {
             if (IsFirstR)
             {
-                APP.Killffmpeg();
-                APP.SaveWkData();
-                APP.SaveDraw();
-                Thread.Sleep(100);
-                System.Environment.Exit(0);
+                MessageBoxResult br= MessageWindow.Show("确定退出系统？","退出",MessageBoxButton.OKCancel);
+                if (br == MessageBoxResult.OK)
+                {
+                    APP.Killffmpeg();
+                    APP.SaveWkData();
+                    APP.SaveDraw();
+                    Thread.Sleep(100);
+                    System.Environment.Exit(0);
+                }
             }
             else
             {
@@ -1821,6 +1825,11 @@ namespace XHWK.WKTool
                     }
                     #endregion
                 }
+                //翻转
+                if(model_VideoList.Count>1)
+                {
+                    model_VideoList.Reverse();
+                }
             }
             catch (Exception ex)
             {
@@ -2645,22 +2654,27 @@ namespace XHWK.WKTool
                 IsSuspendR = false;
                 //BtnRecording.Content = "暂停录制";
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_23.png"));
-                ImgStop.Visibility = Visibility.Collapsed;
-                ImgStopTwo.Visibility = Visibility.Visible;
                 TxbRecordingWord.Text = "暂停";
-                #region 2秒内不可点击
+                #region 4秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
                     Dispatcher.Invoke(() =>
                     {
                         BtnRecord.IsEnabled = false;
                         btnStop.IsEnabled = false;
+                        ImgStop.Visibility = Visibility.Visible;
+                        ImgStopTwo.Visibility = Visibility.Collapsed;
                     });
-                    Thread.Sleep(2000);
+                }))).Start();
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(4000);
                     Dispatcher.Invoke(() =>
                     {
                         BtnRecord.IsEnabled = true;
                         btnStop.IsEnabled = true;
+                        ImgStop.Visibility = Visibility.Collapsed;
+                        ImgStopTwo.Visibility = Visibility.Visible;
                     });
                 }))).Start();
                 #endregion
@@ -2963,8 +2977,11 @@ namespace XHWK.WKTool
                         if (ThuRes)
                         {
                             Bitmap bmp = ImageHelper.ReadBitmapFile(ThumbnailPathName);
-                            imgW = bmp.Width + (bmp.Width % 2 > 0 ? 1 : 0);
-                            imgH = bmp.Height + (bmp.Height % 2 > 0 ? 1 : 0);
+                            if (bmp != null)
+                            {
+                                imgW = bmp.Width + (bmp.Width % 2 > 0 ? 1 : 0);
+                                imgH = bmp.Height + (bmp.Height % 2 > 0 ? 1 : 0);
+                            }
                         }
 
                         APP.FFmpeg.VideoTranscode(VideoSynthesisPathName, VideoSavePathName, imgW, imgH);
@@ -4528,16 +4545,5 @@ namespace XHWK.WKTool
         {
             HideAngleBorder();
         }
-
-        private void Button_Click_1(object sender, RoutedEventArgs e)
-        {
-            Thread.Sleep(2000);
-        }
-
-        private void Button_Click_2(object sender, RoutedEventArgs e)
-        {
-            
-            MessageWindow.Show("A："+ActualWidth*(PrimaryScreen.DpiX / 96f)+"x" +ActualHeight * (PrimaryScreen.DpiY / 96f) + "  wh："+Width+"x"+Height);
-        }
     }
 }