|
@@ -143,7 +143,6 @@ namespace XHWK.WKTool
|
143
|
143
|
//开始,暂停
|
144
|
144
|
BtnRecordingScreen_Click(null, null);
|
145
|
145
|
}
|
146
|
|
-
|
147
|
146
|
if (e.KeyValue == (int)Keys.F6 && (int)Control.ModifierKeys == (int)Keys.Control)
|
148
|
147
|
{
|
149
|
148
|
//结束
|
|
@@ -273,7 +272,6 @@ namespace XHWK.WKTool
|
273
|
272
|
1000
|
274
|
273
|
);
|
275
|
274
|
}
|
276
|
|
-
|
277
|
275
|
_state = State.Loading;
|
278
|
276
|
_videoInfo = new Model_Video
|
279
|
277
|
{
|
|
@@ -284,13 +282,8 @@ namespace XHWK.WKTool
|
284
|
282
|
if (App.W_CountdownWindow == null)
|
285
|
283
|
{
|
286
|
284
|
App.W_CountdownWindow = new CountdownWindow();
|
287
|
|
- App.W_CountdownWindow.Initialize(true);
|
288
|
|
- }
|
289
|
|
- else
|
290
|
|
- {
|
291
|
|
- App.W_CountdownWindow.Initialize(true);
|
292
|
285
|
}
|
293
|
|
- App.W_CountdownWindow.Show();
|
|
286
|
+ App.W_CountdownWindow.InitAndShow(true);
|
294
|
287
|
BtnRecordingScreen.Visibility = Visibility.Collapsed;
|
295
|
288
|
BtnRecordingScreenPause.Visibility = Visibility.Visible;
|
296
|
289
|
BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
|
|
@@ -574,25 +567,28 @@ namespace XHWK.WKTool
|
574
|
567
|
GetTimeStamp();
|
575
|
568
|
try
|
576
|
569
|
{
|
577
|
|
- Dispatcher.Invoke(() =>
|
578
|
|
- {
|
579
|
|
- if (App.W_PracticeWindow == null)
|
|
570
|
+ Dispatcher.Invoke
|
|
571
|
+ (
|
|
572
|
+ () =>
|
580
|
573
|
{
|
581
|
|
- App.W_PracticeWindow = new PracticeWindow
|
|
574
|
+ if (App.W_PracticeWindow == null)
|
582
|
575
|
{
|
583
|
|
- Width = pwidth,
|
584
|
|
- Height = pHeight,
|
585
|
|
- Left = 0,
|
586
|
|
- Top = 0
|
587
|
|
- };
|
|
576
|
+ App.W_PracticeWindow = new PracticeWindow
|
|
577
|
+ {
|
|
578
|
+ Width = pwidth,
|
|
579
|
+ Height = pHeight,
|
|
580
|
+ Left = 0,
|
|
581
|
+ Top = 0
|
|
582
|
+ };
|
|
583
|
+ }
|
|
584
|
+ App.W_PracticeWindow.Initialize(); // imagePath);
|
|
585
|
+ flg = 11;
|
|
586
|
+ App.W_PracticeWindow.Blue();
|
|
587
|
+ App.W_PracticeWindow.Show();
|
|
588
|
+ App.W_PracticeWindow.Topmost = true;
|
|
589
|
+ App.W_PracticeWindow.Focus();
|
588
|
590
|
}
|
589
|
|
- App.W_PracticeWindow.Initialize(); // imagePath);
|
590
|
|
- flg = 11;
|
591
|
|
- App.W_PracticeWindow.Blue();
|
592
|
|
- App.W_PracticeWindow.Show();
|
593
|
|
- App.W_PracticeWindow.Topmost = true;
|
594
|
|
- App.W_PracticeWindow.Focus();
|
595
|
|
- });
|
|
591
|
+ );
|
596
|
592
|
new Thread
|
597
|
593
|
(
|
598
|
594
|
() =>
|
|
@@ -740,7 +736,17 @@ namespace XHWK.WKTool
|
740
|
736
|
/// <returns></returns>
|
741
|
737
|
public string GetTimeStamp()
|
742
|
738
|
{
|
743
|
|
- TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
|
|
739
|
+ TimeSpan ts = DateTime.Now
|
|
740
|
+ - new DateTime
|
|
741
|
+ (
|
|
742
|
+ 1970,
|
|
743
|
+ 1,
|
|
744
|
+ 1,
|
|
745
|
+ 0,
|
|
746
|
+ 0,
|
|
747
|
+ 0,
|
|
748
|
+ 0
|
|
749
|
+ );
|
744
|
750
|
return Convert.ToInt64(ts.TotalMilliseconds).ToString();
|
745
|
751
|
}
|
746
|
752
|
|
|
@@ -800,7 +806,17 @@ namespace XHWK.WKTool
|
800
|
806
|
#region 录屏批注取消画笔
|
801
|
807
|
|
802
|
808
|
string imagePath = Path.Combine(_temppath, time + ".jpg");
|
803
|
|
- ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath);
|
|
809
|
+ ImageHelper.GetScreenshot
|
|
810
|
+ (
|
|
811
|
+ new Rectangle
|
|
812
|
+ (
|
|
813
|
+ 0,
|
|
814
|
+ 0,
|
|
815
|
+ 0,
|
|
816
|
+ 0
|
|
817
|
+ ),
|
|
818
|
+ imagePath
|
|
819
|
+ );
|
804
|
820
|
|
805
|
821
|
#endregion 录屏批注取消画笔
|
806
|
822
|
|
|
@@ -865,12 +881,16 @@ namespace XHWK.WKTool
|
865
|
881
|
{
|
866
|
882
|
if (_state == State.Pause || _state == State.Start)
|
867
|
883
|
{
|
868
|
|
- MessageBoxResult br = MessageWindow.Show("退出将结束并保存录制,是否继续?", "提示", MessageBoxButton.OKCancel);
|
|
884
|
+ MessageBoxResult br = MessageWindow.Show
|
|
885
|
+ (
|
|
886
|
+ "退出将结束并保存录制,是否继续?",
|
|
887
|
+ "提示",
|
|
888
|
+ MessageBoxButton.OKCancel
|
|
889
|
+ );
|
869
|
890
|
if (br == MessageBoxResult.Cancel)
|
870
|
891
|
{
|
871
|
892
|
return;
|
872
|
893
|
}
|
873
|
|
-
|
874
|
894
|
BtnStopRecordingScreen_Click(null, null);
|
875
|
895
|
}
|
876
|
896
|
App.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
|