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

XHWK.Model/Properties/AssemblyInfo.cs

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

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="17" />
-    <add key="VersionName" value="1.1.6" />
+    <add key="VersionCode" value="18" />
+    <add key="VersionName" value="1.1.7" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/PrintWindow.xaml

@@ -84,7 +84,7 @@
                     Margin="50,20,50,0"
                     Visibility="Visible" />
                     <Label Grid.Row="0"
-                    HorizontalAlignment="Center" Width="100"
+                    HorizontalAlignment="Center" Width="120"
                     x:Name="lbProcess"
                     Height="30"
                     Margin="0,20,0,0"

XHWK.WKTool/PrintWindow.xaml.cs

@@ -118,7 +118,7 @@ namespace XHWK.WKTool
             Dispatcher.Invoke(() =>
             {
                 pgbProcess.Value = num;
-                lbProcess.Content = string.Format("{0}/{1}", num, 100);
+                lbProcess.Content = string.Format("{0}% / {1}%", num, 100);
                 if (num < 99)
                 {
                     num++;
@@ -166,7 +166,7 @@ namespace XHWK.WKTool
                     num = 99;
                     times.Stop();
                     pgbProcess.Value = 100;
-                    lbProcess.Content = string.Format("{0}/{1}", 100, 100);
+                    lbProcess.Content = string.Format("{0}% / {1}%", 100, 100);
                     MessageWindow.Show("打印成功！");
                     tip_outer.Visibility = Visibility.Collapsed;
                 });
@@ -194,7 +194,7 @@ namespace XHWK.WKTool
              {
                  I = 1;
                  pgbProcess.Value = I * 100 / 100;
-                 lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                 lbProcess.Content = string.Format("{0}% / {1}%", I, 100);
                  tip_outer.Visibility = Visibility.Visible;
                  //I = 0;
              });
@@ -239,7 +239,7 @@ namespace XHWK.WKTool
                             {
                                 I = 100;
                                 pgbProcess.Value = I * 100 / 100;
-                                lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                                lbProcess.Content = string.Format("{0}% / {1}%", I, 100);
                                 APP.myloading.Hide();
                                 I = 0;
                             });
@@ -296,7 +296,7 @@ namespace XHWK.WKTool
                 try
                 {
                         pgbProcess.Value = I * 100 / 100;
-                        lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                        lbProcess.Content = string.Format("{0}% / {1}%", I, 100);
                         I++;
                 }
                 catch (Exception ex)

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -397,16 +397,16 @@
             <ScrollViewer x:Name="gridSetUp" Grid.Row="1" VerticalScrollBarVisibility="Auto" Visibility="Collapsed">
                 <Grid Grid.Row="1"   Background="#FFFFFF" >
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="90"/>
-                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
                         <RowDefinition Height="50"/>
-                        <RowDefinition Height="60"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
-                        <RowDefinition Height="70"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
@@ -414,18 +414,17 @@
                         <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="0" Text="智能笔" FontSize="16" Foreground="#333333" 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"/>
+                    <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" HorizontalAlignment="Right"/>
                     <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-
                         <RadioButton x:Name="rbnMP4"  Cursor="Hand" Style="{StaticResource radBase}" Content=" MP4" FontSize="14" Foreground="#333333" VerticalAlignment="Top" IsChecked="True"/>
                         <RadioButton x:Name="rbnFLV" Cursor="Hand" Style="{StaticResource radBase}" Content=" FLV" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
                         <RadioButton x:Name="rbnAVI" Cursor="Hand" Style="{StaticResource radBase}" Content=" AVI" FontSize="14" Foreground="#333333" Margin="20,-26,0,0" Visibility="Collapsed"/>
                     </StackPanel>
 
-                    <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
+                    <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" HorizontalAlignment="Right"/>
                     <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <RadioButton Cursor="Hand" x:Name="rbnRight" Style="{StaticResource radBase}" Content=" 右上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="0,0,0,0" IsChecked="True"/>
                         <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Style="{StaticResource radBase}" Content=" 右下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
@@ -440,33 +439,33 @@
 
 
                     <!--接口地址-->
-                    <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,20,0,0"/>
+                    <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,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"/>
+                        <TextBlock Text="http://" FontSize="14" Padding="0,0,5,0"/>
+                        <TextBox x:Name="txbInterfaceAddress" FontSize="14" Width="467" Height="30" Margin="0,-30,0,0"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
                     </StackPanel>
 
                     <!--上传地址-->
-                    <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"/>
+                    <TextBlock Grid.Row="4" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
+                    <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                        <TextBlock Text="http://" FontSize="14" Padding="0,0,5,0"/>
+                        <TextBox x:Name="txbImageUploadAddress" FontSize="14" Margin="0,-30,0,0" Width="467" Height="30"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
                     </StackPanel>
 
                     <!--下载地址-->
-                    <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"/>
+                    <TextBlock Grid.Row="5" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
+                    <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                        <TextBlock Text="http://" FontSize="14" Padding="0,0,5,0"/>
+                        <TextBox x:Name="txbPictureShowsAddress" FontSize="14" Margin="0,-30,0,0" Width="467" Height="30"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
                     </StackPanel>
 
-                    <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"/>
+                    <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Padding="0,0,0,0" />
+                    <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                        <Border Background="#CDD6E0" Width="522" Height="30" CornerRadius="3" Margin="0,-30,0,0">
+                            <Label x:Name="txbStoragePath" Background="#FFFFFF" Margin="0,0,0,0" Content="D:\" FontSize="14" Foreground="#333333" Padding="10,7,2,2" Width="520" Height="28" BorderBrush="{x:Null}" BorderThickness="0"/>
                         </Border>
                         <!--浏览按钮-->
-                        <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+                        <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="14" Width="80" Height="30" Margin="18,-30,0,0" Click="BtnBrowse_Click">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
@@ -483,21 +482,21 @@
                             </Button.Template>
                         </Button>
                     </StackPanel>
-
-                    <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 Grid.Row="7" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
+                    <StackPanel Grid.Row="7" Grid.Column="1">
+                        <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,0,0,0"/>
+                    </StackPanel>
+                    <TextBlock Grid.Row="9" Grid.Column="0" Text="版本号" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
+                    <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
                     </StackPanel>
 
-                    <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 Grid.Row="8" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
+                    <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
                     </StackPanel>
 
-                    <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,10,10,10" Click="BtnSave_Click">
                         <Button.Template>