Browse Source

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

录屏添加倒计时
tags/3.0.0
张剑 3 years ago
parent
commit
06a615c90d

+ 2
- 2
XHWK.WKTool/App.config View File

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

+ 24
- 15
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

341
                 SetUpVideoPathName();
341
                 SetUpVideoPathName();
342
                 k_hook.Start();//安装键盘钩子
342
                 k_hook.Start();//安装键盘钩子
343
 
343
 
344
-                //if (APP.W_CountdownWindow == null)
345
-                //{
346
-                //    APP.W_CountdownWindow = new CountdownWindow();
347
-                //    APP.W_CountdownWindow.Initialize(true, 1800);
348
-                //}
349
-                //else
350
-                //{
351
-                //    APP.W_CountdownWindow.Initialize(true, 1800);
352
-                //}
353
-                //APP.W_CountdownWindow.Show();
344
+                if (APP.W_CountdownWindow == null)
345
+                {
346
+                    APP.W_CountdownWindow = new CountdownWindow();
347
+                    APP.W_CountdownWindow.Initialize(true, 3000);
348
+                }
349
+                else
350
+                {
351
+                    APP.W_CountdownWindow.Initialize(true, 3000);
352
+                }
353
+                APP.W_CountdownWindow.Show();
354
+
355
+              
354
 
356
 
355
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
357
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
356
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
358
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
384
                 helper1 = new ZAudioRecordHelper(TempAudioPathName1, ZAudioRecordHelper.RecordType.microphone);
386
                 helper1 = new ZAudioRecordHelper(TempAudioPathName1, ZAudioRecordHelper.RecordType.microphone);
385
                 helper2 = new ZAudioRecordHelper(TempAudioPathName2, ZAudioRecordHelper.RecordType.loudspeaker);
387
                 helper2 = new ZAudioRecordHelper(TempAudioPathName2, ZAudioRecordHelper.RecordType.loudspeaker);
386
 
388
 
387
-                helper1.StartRecordAudio();
388
-                helper2.StartRecordAudio();
389
-
390
                 winHandle = new WindowInteropHelper(this).Handle;
389
                 winHandle = new WindowInteropHelper(this).Handle;
391
                 var curScreen = Screen.FromHandle(winHandle);
390
                 var curScreen = Screen.FromHandle(winHandle);
392
                 int RecordWidth = curScreen.Bounds.Width;
391
                 int RecordWidth = curScreen.Bounds.Width;
393
                 int RecordHeight = curScreen.Bounds.Height;
392
                 int RecordHeight = curScreen.Bounds.Height;
394
                 helper3 = new ZVideoRecordHelper(TempVideoPathName, RecordWidth, RecordHeight);
393
                 helper3 = new ZVideoRecordHelper(TempVideoPathName, RecordWidth, RecordHeight);
395
-                helper3.StartRecordVideo();
396
-                _state = State.Start;
394
+            
395
+                new Thread(o =>
396
+                {
397
+                    Thread.Sleep(3000);
398
+                    Dispatcher.Invoke(() => {
399
+                        _state = State.Start;
400
+                        helper1.StartRecordAudio();
401
+                        helper2.StartRecordAudio();
402
+                        helper3.StartRecordVideo();
403
+                    });
404
+                })
405
+                { IsBackground = true }.Start();
397
 
406
 
398
                 Console.WriteLine("TempAudioPathName1:"+ TempAudioPathName1);
407
                 Console.WriteLine("TempAudioPathName1:"+ TempAudioPathName1);
399
                 Console.WriteLine("TempAudioPathName2:" + TempAudioPathName2);
408
                 Console.WriteLine("TempAudioPathName2:" + TempAudioPathName2);

+ 13
- 13
XHWK.WKTool/UControl/Uc_VideoItem.xaml View File

5
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6
     xmlns:local="clr-namespace:XHWK.WKTool.UControl"
6
     xmlns:local="clr-namespace:XHWK.WKTool.UControl"
7
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8
-    d:DesignHeight="260"
9
-    d:DesignWidth="250"
8
+    Width="250"
9
+    Height="260"
10
     mc:Ignorable="d">
10
     mc:Ignorable="d">
11
     <Grid>
11
     <Grid>
12
         <Grid>
12
         <Grid>
13
             <Grid.RowDefinitions>
13
             <Grid.RowDefinitions>
14
-                <RowDefinition Height="10*" />
15
-                <RowDefinition Height="130*" />
16
-                <RowDefinition Height="110*" />
17
-                <RowDefinition Height="10*" />
14
+                <RowDefinition Height="10" />
15
+                <RowDefinition Height="130" />
16
+                <RowDefinition Height="110" />
17
+                <RowDefinition Height="10" />
18
             </Grid.RowDefinitions>
18
             </Grid.RowDefinitions>
19
             <!--  视频缩略图  -->
19
             <!--  视频缩略图  -->
20
             <Grid Grid.Row="1">
20
             <Grid Grid.Row="1">
21
                 <Grid.ColumnDefinitions>
21
                 <Grid.ColumnDefinitions>
22
-                    <ColumnDefinition Width="20*" />
23
-                    <ColumnDefinition Width="210*" />
24
-                    <ColumnDefinition Width="20*" />
22
+                    <ColumnDefinition Width="20" />
23
+                    <ColumnDefinition Width="210" />
24
+                    <ColumnDefinition Width="20" />
25
                 </Grid.ColumnDefinitions>
25
                 </Grid.ColumnDefinitions>
26
                 <Grid Grid.Column="1">
26
                 <Grid Grid.Column="1">
27
                     <Border Background="#eeeeee">
27
                     <Border Background="#eeeeee">
83
                     <RowDefinition Height="30*" />
83
                     <RowDefinition Height="30*" />
84
                     <RowDefinition Height="5*" />
84
                     <RowDefinition Height="5*" />
85
                     <RowDefinition Height="30*" />
85
                     <RowDefinition Height="30*" />
86
-                    <RowDefinition Height="40*" />
86
+                    <RowDefinition Height="36*" />
87
                 </Grid.RowDefinitions>
87
                 </Grid.RowDefinitions>
88
                 <!--  名  -->
88
                 <!--  名  -->
89
                 <Grid Grid.Row="1">
89
                 <Grid Grid.Row="1">
151
                 <Grid Grid.Row="4">
151
                 <Grid Grid.Row="4">
152
                     <Grid.ColumnDefinitions>
152
                     <Grid.ColumnDefinitions>
153
                         <ColumnDefinition Width="20*" />
153
                         <ColumnDefinition Width="20*" />
154
-                        <ColumnDefinition Width="100*" />
154
+                        <ColumnDefinition Width="64*" />
155
                         <ColumnDefinition Width="10*" />
155
                         <ColumnDefinition Width="10*" />
156
-                        <ColumnDefinition Width="100*" />
156
+                        <ColumnDefinition Width="64*" />
157
                         <ColumnDefinition Width="20*" />
157
                         <ColumnDefinition Width="20*" />
158
                     </Grid.ColumnDefinitions>
158
                     </Grid.ColumnDefinitions>
159
                     <Grid Grid.Column="1">
159
                     <Grid Grid.Column="1">
160
                         <Border
160
                         <Border
161
                             x:Name="BorUploadBtn"
161
                             x:Name="BorUploadBtn"
162
                             Background="#FF3492F4"
162
                             Background="#FF3492F4"
163
-                            CornerRadius="6">
163
+                            CornerRadius="4">
164
                             <Button
164
                             <Button
165
                                 x:Name="BtnUpload"
165
                                 x:Name="BtnUpload"
166
                                 HorizontalAlignment="Stretch"
166
                                 HorizontalAlignment="Stretch"

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

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

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

126
 
126
 
127
         #endregion 上传
127
         #endregion 上传
128
 
128
 
129
-        //private double screeHeight = SystemParameters.FullPrimaryScreenHeight;
130
-        //private double screeWidth = SystemParameters.FullPrimaryScreenWidth;
129
+
131
         /// <summary>
130
         /// <summary>
132
         /// 键盘钩子
131
         /// 键盘钩子
133
         /// </summary>
132
         /// </summary>
2911
                 //获取设置控件大小   新增     页面原始1061 911
2910
                 //获取设置控件大小   新增     页面原始1061 911
2912
                 double PropWid = pageW / 1061.00;
2911
                 double PropWid = pageW / 1061.00;
2913
                 double PropHei = pageH / 911.00;
2912
                 double PropHei = pageH / 911.00;
2914
-                ControlWidth = 250.00 * PropWid;
2915
-                ControlHeight = 260.00 * PropHei;
2913
+                //ControlWidth = 250.00 * PropWid;
2914
+                //ControlHeight = 260.00 * PropHei;
2916
                 //ControlWidth=
2915
                 //ControlWidth=
2917
                 //ControlHeight=
2916
                 //ControlHeight=
2918
                 //根据页面大小获取每页显示的数量 H260W250
2917
                 //根据页面大小获取每页显示的数量 H260W250

+ 1
- 1
打包脚本/Inno Setup星火微课.iss View File

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

Loading…
Cancel
Save