适配分辨率小于1366x768的屏幕

录屏添加倒计时

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="83" />
-    <add key="VersionName" value="2.6.3" />
+    <add key="VersionCode" value="84" />
+    <add key="VersionName" value="2.6.4" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -341,16 +341,18 @@ namespace XHWK.WKTool
                 SetUpVideoPathName();
                 k_hook.Start();//安装键盘钩子
 
-                //if (APP.W_CountdownWindow == null)
-                //{
-                //    APP.W_CountdownWindow = new CountdownWindow();
-                //    APP.W_CountdownWindow.Initialize(true, 1800);
-                //}
-                //else
-                //{
-                //    APP.W_CountdownWindow.Initialize(true, 1800);
-                //}
-                //APP.W_CountdownWindow.Show();
+                if (APP.W_CountdownWindow == null)
+                {
+                    APP.W_CountdownWindow = new CountdownWindow();
+                    APP.W_CountdownWindow.Initialize(true, 3000);
+                }
+                else
+                {
+                    APP.W_CountdownWindow.Initialize(true, 3000);
+                }
+                APP.W_CountdownWindow.Show();
+
+              
 
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
@@ -384,16 +386,23 @@ namespace XHWK.WKTool
                 helper1 = new ZAudioRecordHelper(TempAudioPathName1, ZAudioRecordHelper.RecordType.microphone);
                 helper2 = new ZAudioRecordHelper(TempAudioPathName2, ZAudioRecordHelper.RecordType.loudspeaker);
 
-                helper1.StartRecordAudio();
-                helper2.StartRecordAudio();
-
                 winHandle = new WindowInteropHelper(this).Handle;
                 var curScreen = Screen.FromHandle(winHandle);
                 int RecordWidth = curScreen.Bounds.Width;
                 int RecordHeight = curScreen.Bounds.Height;
                 helper3 = new ZVideoRecordHelper(TempVideoPathName, RecordWidth, RecordHeight);
-                helper3.StartRecordVideo();
-                _state = State.Start;
+            
+                new Thread(o =>
+                {
+                    Thread.Sleep(3000);
+                    Dispatcher.Invoke(() => {
+                        _state = State.Start;
+                        helper1.StartRecordAudio();
+                        helper2.StartRecordAudio();
+                        helper3.StartRecordVideo();
+                    });
+                })
+                { IsBackground = true }.Start();
 
                 Console.WriteLine("TempAudioPathName1:"+ TempAudioPathName1);
                 Console.WriteLine("TempAudioPathName2:" + TempAudioPathName2);

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -5,23 +5,23 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:XHWK.WKTool.UControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="260"
-    d:DesignWidth="250"
+    Width="250"
+    Height="260"
     mc:Ignorable="d">
     <Grid>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="10*" />
-                <RowDefinition Height="130*" />
-                <RowDefinition Height="110*" />
-                <RowDefinition Height="10*" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="130" />
+                <RowDefinition Height="110" />
+                <RowDefinition Height="10" />
             </Grid.RowDefinitions>
             <!--  视频缩略图  -->
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="20*" />
-                    <ColumnDefinition Width="210*" />
-                    <ColumnDefinition Width="20*" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="210" />
+                    <ColumnDefinition Width="20" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="1">
                     <Border Background="#eeeeee">
@@ -83,7 +83,7 @@
                     <RowDefinition Height="30*" />
                     <RowDefinition Height="5*" />
                     <RowDefinition Height="30*" />
-                    <RowDefinition Height="40*" />
+                    <RowDefinition Height="36*" />
                 </Grid.RowDefinitions>
                 <!--  名  -->
                 <Grid Grid.Row="1">
@@ -151,16 +151,16 @@
                 <Grid Grid.Row="4">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="20*" />
-                        <ColumnDefinition Width="100*" />
+                        <ColumnDefinition Width="64*" />
                         <ColumnDefinition Width="10*" />
-                        <ColumnDefinition Width="100*" />
+                        <ColumnDefinition Width="64*" />
                         <ColumnDefinition Width="20*" />
                     </Grid.ColumnDefinitions>
                     <Grid Grid.Column="1">
                         <Border
                             x:Name="BorUploadBtn"
                             Background="#FF3492F4"
-                            CornerRadius="6">
+                            CornerRadius="4">
                             <Button
                                 x:Name="BtnUpload"
                                 HorizontalAlignment="Stretch"

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="星火微课系统"
     Width="950"
-    Height="768"
+    Height="700"
     AllowsTransparency="True"
     Background="Transparent"
     BorderBrush="#eee"
@@ -476,7 +476,7 @@
                             <StackPanel Orientation="Horizontal" />
                             <Button
                                 x:Name="BtnRecord"
-                                Margin="5,0"
+                                Margin="10,5,0,5"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Button.Template="{DynamicResource SkinBtnRecord}"
@@ -581,7 +581,7 @@
             <!--  工具栏和录制区域 H965  -->
             <Grid Grid.Row="2">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200*" />
+                    <ColumnDefinition Width="180*" />
                     <ColumnDefinition Width="10*" />
                     <ColumnDefinition Width="1061*" />
                 </Grid.ColumnDefinitions>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -126,8 +126,7 @@ namespace XHWK.WKTool
 
         #endregion 上传
 
-        //private double screeHeight = SystemParameters.FullPrimaryScreenHeight;
-        //private double screeWidth = SystemParameters.FullPrimaryScreenWidth;
+
         /// <summary>
         /// 键盘钩子
         /// </summary>
@@ -2911,8 +2910,8 @@ namespace XHWK.WKTool
                 //获取设置控件大小   新增     页面原始1061 911
                 double PropWid = pageW / 1061.00;
                 double PropHei = pageH / 911.00;
-                ControlWidth = 250.00 * PropWid;
-                ControlHeight = 260.00 * PropHei;
+                //ControlWidth = 250.00 * PropWid;
+                //ControlHeight = 260.00 * PropHei;
                 //ControlWidth=
                 //ControlHeight=
                 //根据页面大小获取每页显示的数量 H260W250

打包脚本/Inno Setup星火微课.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "2.6.2"
+#define MyAppVersion "2.6.4"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\C#\xhwkclient\XHWK.WKTool\bin\x86\Debug\"