BUG修改

Common/system/CameraHelper.cs

@@ -115,8 +115,12 @@ namespace Common.system
                     }
 
                     string fullPath = Path.Combine(filePath, fileName + "-cap.jpg");
-                    bitmap.Save(fullPath, ImageFormat.Jpeg);
+
+                    System.Drawing.Bitmap objNewPic = new System.Drawing.Bitmap(bitmap, 172, 124);//图片保存的大小尺寸  
+                    objNewPic.Save(fullPath, ImageFormat.Jpeg);
+                    //bitmap.Save(fullPath, ImageFormat.Jpeg);
                     bitmap.Dispose();
+                    objNewPic.Dispose();
                     return fullPath;
                 }
                 return null;

XHWK.WKTool/CountdownWindow.xaml

@@ -23,6 +23,6 @@
                     Width="600"
                     Height="600"
                     Source=".\Images\countdown3_1.png" />
-        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="77" Margin="0,750,0,0" Width="682" Foreground="#FF5B5151" FontSize="36" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="77" Margin="0,750,0,0" Width="682" Foreground="#FF5B5151" FontSize="36" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Collapsed"/>
     </Grid>
 </Window>

XHWK.WKTool/MessageWindow.xaml

@@ -25,11 +25,11 @@
             <TextBlock x:Name="tbkContent" Margin="20,5,20,0" TextWrapping="Wrap" VerticalAlignment="Center" FontSize="15" Foreground="#FF919191" Grid.Row="1" HorizontalAlignment="Center" Text=""/>
         </Grid>
         <Grid Grid.Row="2" Margin="0,0,0,0">
-            <Border x:Name="borOk" Background="#EE3A52" CornerRadius="6" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,30,20">
-                <Button x:Name="BtnOK" Width="104" Height="42" Content="确定" FontSize="18"  Background="#00000000"  BorderBrush="{x:Null}" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Foreground="White"  Cursor="Hand" Click="BtnOK_Click"/>
+            <Border x:Name="borOk" Background="#2D8CF0" CornerRadius="6" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,30,20">
+                <Button x:Name="BtnOK" Width="104" Height="42" Content="确定" FontSize="17"  Background="#00000000"  BorderBrush="{x:Null}" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Foreground="White"  Cursor="Hand" Click="BtnOK_Click"/>
             </Border>
             <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6"  HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,150,20">
-                <Button x:Name="BtnCancel" Width="104" Height="42" Content="取消" FontSize="18" Background="#00000000" BorderBrush="{x:Null}"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Cursor="Hand" Click="BtnCancel_Click"/>
+                <Button x:Name="BtnCancel" Width="104" Height="42" Content="取消" FontSize="17" Background="#00000000" BorderBrush="{x:Null}"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Cursor="Hand" Click="BtnCancel_Click"/>
             </Border>
         </Grid>
 

XHWK.WKTool/PrintWindow.xaml

@@ -12,6 +12,24 @@
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
+    <Window.Resources>
+        <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="Chrome" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="120"/>
@@ -20,37 +38,33 @@
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Background="#E6EAF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
             <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
+                <RowDefinition Height="50"/>
+                <RowDefinition Height="50"/>
                 <RowDefinition Height="*"/>
-                <RowDefinition Height="70"/>
             </Grid.RowDefinitions>
-            <!--<TextBlock Grid.Row="0" Text="打印预览" Background="#2E8CF0" Foreground="#FFFFFF" Width="50" HorizontalAlignment="Left" Margin="10,5,0,0"/>-->
-            <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,10,0,0">
-                <TextBlock  Text="打印机：" Width="210" FontSize="20"/>
-            </StackPanel>
-
-            <Button Grid.Row="2" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,20,0" Click="BtnClose_Click">
+            <Button Cursor="Hand" Grid.Row="0" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,10,0" Click="BtnClose_Click" Style="{StaticResource NoMouseOverButtonStyle}">
 
             </Button>
-            <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0" Height="40">
+            <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0" Height="40">
+                <TextBlock  Text="打印机："  FontSize="20" Padding="0,5,0,0"/>
                 <ComboBox Cursor="Hand" Width="210"
                                 x:Name="cmbClass"
-                                Padding="10,0,10,0"
+                                Padding="30,0,10,0"
                                 VerticalContentAlignment="Center"
                                 BorderThickness="0"
                                 DisplayMemberPath="Value"
                                 FontSize="14"
                                 SelectedValuePath="Key"
                                 />
-                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0" Padding="0,10,0,0"/>
+                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0" Padding="0,5,0,0"/>
                 <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
                         <RowDefinition Height="auto"/>
                     </Grid.RowDefinitions>
-                    <Button Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
-                    <Button Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
+                    <Button Cursor="Hand" Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
+                    <Button Cursor="Hand" Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
                 </Grid>
                 <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
                 <RadioButton x:Name="rbnSquarePoint" Content="方点" FontSize="16"  Margin="0,15,0,0" IsChecked="True"/>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -95,16 +95,16 @@ namespace XHWK.WKTool
                 //}
                 if (printResult == 0)// 0为成功
                 {
-                    MessageWindow.Show("打印成功", "", MessageBoxButton.OKCancel);
+                    MessageWindow.Show("打印成功");
                 }
                 else
                 {
-                    MessageWindow.Show(standardError, "", MessageBoxButton.OKCancel);
+                    MessageWindow.Show(standardError);
                 }
             }
             else
             {
-                MessageWindow.Show(msg, "", MessageBoxButton.OKCancel);
+                MessageWindow.Show(msg);
             }
         }
         /// <summary>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -341,8 +341,8 @@ namespace XHWK.WKTool
                 btnBlackPenOne.IsEnabled = true;//蓝笔可点击
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
-                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
-                btnReturn.IsEnabled = false;//返回主界面不可点击
+                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+                btnReturn.IsEnabled = true;//返回主界面可点击
                 txbTime.Visibility = Visibility.Visible;//时间显示
                 try
                 {
@@ -378,6 +378,8 @@ namespace XHWK.WKTool
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
                 btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
+                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                btnReturn.IsEnabled = false;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -876,12 +878,28 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnReturn_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.W_XHMicroLessonSystemWindow == null)
+            if (!txbTime.Text.Equals("00:00"))
             {
-                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                MessageBoxResult dr = MessageWindow.Show("返回主界面视频不保存，是否返回？", "提示", MessageBoxButton.YesNo);
+                if (dr == MessageBoxResult.OK)
+                {
+                    if (APP.W_XHMicroLessonSystemWindow == null)
+                    {
+                        APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                    }
+                    APP.W_XHMicroLessonSystemWindow.Show();
+                    Hide();
+                }
+            }
+            else
+            {
+                if (APP.W_XHMicroLessonSystemWindow == null)
+                {
+                    APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                }
+                APP.W_XHMicroLessonSystemWindow.Show();
+                Hide();
             }
-            APP.W_XHMicroLessonSystemWindow.Show();
-            Hide();
         }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -25,6 +25,22 @@
         </Border>
     </Grid>-->
     <Window.Resources>
+        <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="Chrome" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <!--  ListBox容器样式  -->
         <Style x:Key="ListBoxItemContainerStyle" TargetType="{x:Type ListBoxItem}">
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -69,8 +85,8 @@
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnModify_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Visi}"/>
-                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Coll}"/>
+                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Height="20"/>
+                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Height="20"/>
                             </Grid>
                         </Button>
                     </StackPanel>
@@ -105,8 +121,8 @@
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnPlay_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory1.png" Margin="10" Height="20" Visibility="{Binding Visi}"/>
-                                <Image Source="./Images/fileDirectory2.png" Margin="10"  Height="20" Visibility="{Binding Coll}"/>
+                                <Image Source="./Images/fileDirectory1.png" Margin="10" Height="20"/>
+                                <Image Source="./Images/fileDirectory2.png" Margin="10"  Height="20"/>
                             </Grid>
                         </Button>
                         <Button x:Name="btnUpload" Background="Transparent"
@@ -121,8 +137,8 @@
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnDelete_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Visi}"/>
-                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Coll}"/>
+                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Height="20"/>
+                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Height="20"/>
                             </Grid>
                         </Button>
                     </StackPanel>
@@ -294,7 +310,7 @@
                             </Grid>
                         </Border>
                     </Grid>
-                    <Image x:Name="imgDocumentation" Visibility="Visible"/>
+                    <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
 
                     <!--导入图片-->
                     <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
@@ -366,7 +382,7 @@
                 <RowDefinition Height="90"/>
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="50"/>
-                <RowDefinition Height="70"/>
+                <RowDefinition Height="60"/>
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
@@ -375,19 +391,24 @@
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                <TextBlock x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
-            </StackPanel>
-            <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Grid.Row="0" Grid.Column="0" Text="智能笔" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Margin="0,30,0,0"/>
+                <TextBlock Grid.Row="0" Grid.Column="1" x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Margin="30,30,0,0"/>
+
+                <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
+                <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
                 <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0" Visibility="Collapsed"/>
             </StackPanel>
-            <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
+
+                <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
+                <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
                 <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
                 <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
@@ -400,28 +421,29 @@
 
 
             <!--接口地址-->
-            <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="30,0,0,0">
-                <TextBlock Text="接口地址" FontSize="16" Foreground="#2D8CF0" Width="80" Padding="0,25,0,0" Margin="10,0,0,0"/>
-                <TextBlock Text="http://" FontSize="16" Padding="0,25,5,0"/>
+                <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,20,0,0"/>
+                <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                    <TextBlock Text="http://" FontSize="16" Padding="0,20,5,0"/>
                 <TextBox x:Name="txbInterfaceAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
             </StackPanel>
+            
             <!--上传地址-->
-            <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="30,20,0,0">
-                <TextBlock Text="上传地址" FontSize="16" Foreground="#2D8CF0" Width="80" Padding="0,10,0,0" Margin="10,5,0,0"/>
-                <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
+                <TextBlock Grid.Row="4" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
+                <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
+                    <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
                 <TextBox x:Name="txbImageUploadAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
             </StackPanel>
+            
             <!--下载地址-->
-            <StackPanel Grid.Row="5" Orientation="Horizontal" Margin="30,20,0,0">
-                <TextBlock Text="下载地址" FontSize="16" Foreground="#2D8CF0" Width="80" Padding="0,15,0,0" Margin="10,0,0,0"/>
-                <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
+                <TextBlock Grid.Row="5" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
+                <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
+                    <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
                 <TextBox x:Name="txbPictureShowsAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
             </StackPanel>
 
-
-            <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,20,0,0">
-                <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="10,18,10,0" />
-                <Border Background="#CDD6E0" Width="522" Height="43" CornerRadius="3" Margin="10,0,0,0">
+                <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Padding="0,35,0,0" />
+                <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,20,0,0">
+                    <Border Background="#CDD6E0" Width="522" Height="43" CornerRadius="3" Margin="0,0,0,0">
                     <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="10,12,2,2" Width="520" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
                 <!--浏览按钮-->
@@ -442,16 +464,23 @@
                     </Button.Template>
                 </Button>
             </StackPanel>
-            <StackPanel Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                <TextBlock Text="    版本号" FontSize="16" Width="80" Foreground="#2D8CF0"/>
-                <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
+
+                <TextBlock Grid.Row="7" Grid.Column="0" Text="版本号" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
+                <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
             </StackPanel>
-            <StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                <TextBlock Text="版权所有" FontSize="16" Width="80" Foreground="#2D8CF0"/>
-                <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
+
+                <TextBlock Grid.Row="8" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
+                <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
             </StackPanel>
-            <!--第四行 开始按钮-->
-            <Button Cursor="Hand" Grid.Row="9" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
+
+                <TextBlock Grid.Row="9" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
+                <StackPanel Grid.Row="9" Grid.Column="1">
+                    <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,30,0,0"/>
+                </StackPanel>
+                <!--第四行 开始按钮-->
+            <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
@@ -572,38 +601,54 @@
         </Grid>
         <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
             <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
-                <TextBlock Text="颜色：" FontSize="14" Padding="10,10,0,0"/>
+                <TextBlock Text="颜色：" FontSize="14" Padding="10,5,0,0"/>
                 <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
-
-                <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
+                    <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
+                        <Button Cursor="Hand" x:Name="btnRed" Width="20" Height="20" Background="#FF0000" Margin="1,1,1,1" HorizontalAlignment="Center"  Click="BtnRed_Click" Style="{StaticResource NoMouseOverButtonStyle}">
                     <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
+                    </Border>
+                    <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
+                        <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="1,1,1,1" Click="BtnGray_Click" Style="{StaticResource NoMouseOverButtonStyle}">
                     <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
+                    </Border>
+                    <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
+
+
+                        <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="1,1,1,1" Click="BtnCyanBlue_Click" Style="{StaticResource NoMouseOverButtonStyle}">
                     <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
+                    </Border>
+                    <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
+
+
+                        <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="1,1,1,1" Click="BtnYellow_Click" Style="{StaticResource NoMouseOverButtonStyle}">
+                   
                     <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
+                    </Border>
+                    <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
+
+
+                        <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="1,1,1,1" Click="BtnBlue_Click" Style="{StaticResource NoMouseOverButtonStyle}">
                     <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
-                <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,10,0,0" IsChecked="True" Click="RbnFine_Click"/>
-                <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,10,0,0" Click="RbnIn_Click"/>
-                <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,10,0,0" Click="RbnCrude_Click"/>
+                    </Border>
+                    <TextBlock Text="粗细：" FontSize="14" Padding="15,0,0,0" Margin="5,5,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,7,0,0" IsChecked="True" Click="RbnFine_Click"/>
+                <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,7,0,0" Click="RbnIn_Click"/>
+                <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,7,0,0" Click="RbnCrude_Click"/>
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="摄像头：" FontSize="14" Padding="15,10,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,10,0,0" Click="RbnOpen_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,10,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
+                    <TextBlock Text="摄像头：" FontSize="14" Padding="15,6,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,7,0,0" Click="RbnOpen_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,7,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                 </StackPanel>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,0">
-                <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,5,0,0"/>
-                <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,5,5,0"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
+                <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
+                <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
             </StackPanel>
         </Grid>
 

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -312,7 +312,7 @@ namespace XHWK.WKTool
             {
                 CameraHelper.SetCameraDevice(0);
                 RbnOpen = new List<string>();
-                times = new System.Timers.Timer(300)
+                times = new System.Timers.Timer(100)//初始值为300
                 {
                     AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
                 };//设置执行一次（false）还是一直执行(true)
@@ -1550,43 +1550,46 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDelete_Click(object sender, RoutedEventArgs e)
         {
-
-            pageData.menuList[Subscript].IsEnabled = false;
-            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnDelete");
-            for (int i = 0; i < buttons.Count; i++)
+            MessageBoxResult dr = MessageWindow.Show("确定删除该视频？", "提示", MessageBoxButton.OKCancel);
+            if (dr == MessageBoxResult.OK)
             {
-                if (buttons[i] == sender)
+                pageData.menuList[Subscript].IsEnabled = false;
+                List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnDelete");
+                for (int i = 0; i < buttons.Count; i++)
                 {
-
-                    //if (APP.W_PromptWindow == null)
-                    //{
-                    //    APP.W_PromptWindow = new PromptWindow();
-                    //    APP.W_PromptWindow.Owner = this;
-                    //}
-                    //APP.W_PromptWindow.Initialize(pageData.menuList[i].VideoName);
-                    //APP.W_PromptWindow.ShowDialog();
-
-                    foreach (Model_WKData wKData in APP.WKDataList)
+                    if (buttons[i] == sender)
                     {
-                        if (wKData.VideoList == null)
-                        {
-                            continue;
-                        }
 
-                        if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[i].FileGuid))
+                        //if (APP.W_PromptWindow == null)
+                        //{
+                        //    APP.W_PromptWindow = new PromptWindow();
+                        //    APP.W_PromptWindow.Owner = this;
+                        //}
+                        //APP.W_PromptWindow.Initialize(pageData.menuList[i].VideoName);
+                        //APP.W_PromptWindow.ShowDialog();
+
+                        foreach (Model_WKData wKData in APP.WKDataList)
                         {
-                            try
+                            if (wKData.VideoList == null)
                             {
-                                FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).VideoPath);
-                                FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).ThumbnailPath);
-                                wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid));
-                                InitializeUpload();
-                                return;
+                                continue;
                             }
-                            catch (Exception ex)
+
+                            if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[i].FileGuid))
                             {
-                                System.Windows.MessageBox.Show("无法删除视频！" + ex.Message);
-                                return;
+                                try
+                                {
+                                    FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).VideoPath);
+                                    FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).ThumbnailPath);
+                                    wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid));
+                                    InitializeUpload();
+                                    return;
+                                }
+                                catch (Exception ex)
+                                {
+                                    System.Windows.MessageBox.Show("无法删除视频！" + ex.Message);
+                                    return;
+                                }
                             }
                         }
                     }
@@ -2346,8 +2349,8 @@ namespace XHWK.WKTool
                 //暂停
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
-                ImgStop.Visibility = Visibility.Visible;
-                ImgStopTwo.Visibility = Visibility.Collapsed;
+                ImgStop.Visibility = Visibility.Collapsed;
+                ImgStopTwo.Visibility = Visibility.Visible;
                 TxbRecordingWord.Text = "继续";
                 //TimeOut();
                 #region 2秒内不可点击