Browse Source

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

tags/录制修改前
耀 4 years ago
parent
commit
b984a7a475

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

34
     <!--上传每片大小 Mb-->
34
     <!--上传每片大小 Mb-->
35
     <add key="UploadSliceLen" value="1" />
35
     <add key="UploadSliceLen" value="1" />
36
     <!--版本号-->
36
     <!--版本号-->
37
-    <add key="VersionCode" value="28" />
38
-    <add key="VersionName" value="1.2.7" />
37
+    <add key="VersionCode" value="29" />
38
+    <add key="VersionName" value="1.2.8" />
39
     <add key="ClientSettingsProvider.ServiceUri" value="" />
39
     <add key="ClientSettingsProvider.ServiceUri" value="" />
40
   </appSettings>
40
   </appSettings>
41
   <system.web>
41
   <system.web>

+ 1
- 0
XHWK.WKTool/JieTuWindow.xaml.cs View File

127
                 k_hook.Stop();
127
                 k_hook.Stop();
128
                 Current.OnCancel();
128
                 Current.OnCancel();
129
                 APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
129
                 APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
130
+                APP.W_XHMicroLessonSystemWindow.WindowType();
130
                 this.Hide();
131
                 this.Hide();
131
             }
132
             }
132
         }
133
         }

+ 2
- 2
XHWK.WKTool/Properties/AssemblyInfo.cs View File

49
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
49
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
50
 //通过使用 "*",如下所示:
50
 //通过使用 "*",如下所示:
51
 // [assembly: AssemblyVersion("1.0.*")]
51
 // [assembly: AssemblyVersion("1.0.*")]
52
-[assembly: AssemblyVersion("1.2.7.0")]
53
-[assembly: AssemblyFileVersion("1.2.7.0")]
52
+[assembly: AssemblyVersion("1.2.8.0")]
53
+[assembly: AssemblyFileVersion("1.2.8.0")]

+ 28
- 25
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

75
         public ScreenRecordingToolbarWindow()
75
         public ScreenRecordingToolbarWindow()
76
         {
76
         {
77
             InitializeComponent();
77
             InitializeComponent();
78
-            if (APP.W_PracticeWindow == null)
79
-            {
80
-                APP.W_PracticeWindow = new PracticeWindow
81
-                {
82
-                    //APP.W_PracticeWindow.Topmost = true;
83
-                    Width = pwidth,
84
-                    Height = pHeight,
85
-                    Left = 0,
86
-                    Top = 0
87
-                };
88
-                //practiceWin.Owner = this;
89
-            }
90
-            APP.W_PracticeWindow.Show();
91
-            new Thread(new ThreadStart(new Action(() =>
92
-            {
93
-                Thread.Sleep(100);
94
-                Dispatcher.Invoke(() =>
95
-                {
96
-                    this.Owner = APP.W_PracticeWindow;
97
-                    this.Topmost = true;
98
-                });
99
-            }))).Start();
100
-            APP.W_PracticeWindow.Hide();
78
+            this.ResizeMode = ResizeMode.NoResize;
101
         }
79
         }
102
         /// <summary>
80
         /// <summary>
103
         /// 初始化
81
         /// 初始化
104
         /// </summary>
82
         /// </summary>
105
         public void Initialize()
83
         public void Initialize()
106
         {
84
         {
85
+                if (APP.W_PracticeWindow == null)
86
+                {
87
+                    APP.W_PracticeWindow = new PracticeWindow
88
+                    {
89
+                        //APP.W_PracticeWindow.Topmost = true;
90
+                        Width = pwidth,
91
+                        Height = pHeight,
92
+                        Left = 0,
93
+                        Top = 0
94
+                    };
95
+                    //practiceWin.Owner = this;
96
+                }
97
+                APP.W_PracticeWindow.Show();
98
+                new Thread(new ThreadStart(new Action(() =>
99
+                {
100
+                    Thread.Sleep(100);
101
+                    Dispatcher.Invoke(() =>
102
+                    {
103
+                        this.Owner = APP.W_PracticeWindow;
104
+                        this.Topmost = true;
105
+                    });
106
+                }))).Start();
107
+                APP.W_PracticeWindow.Hide();
108
+            
107
             //timer = new System.Timers.Timer(200);
109
             //timer = new System.Timers.Timer(200);
108
             //timer.Interval = 300;
110
             //timer.Interval = 300;
109
             //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
111
             //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
110
             //timer.Enabled = true; //启动计时器
112
             //timer.Enabled = true; //启动计时器
111
 
113
 
112
-                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
114
+            borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
113
                 borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
115
                 borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
114
             flg = 0;
116
             flg = 0;
115
          
117
          
512
                 if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
514
                 if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
513
                 {
515
                 {
514
                     this.Owner = null;
516
                     this.Owner = null;
515
-                    APP.W_PracticeWindow.Hide();
517
+                    APP.W_PracticeWindow.ReturnPractice();
516
                 }
518
                 }
517
             }
519
             }
518
             if (gridToolbar.Visibility == Visibility.Visible)
520
             if (gridToolbar.Visibility == Visibility.Visible)
1086
 
1088
 
1087
                 txbTime.Visibility = Visibility.Hidden;
1089
                 txbTime.Visibility = Visibility.Hidden;
1088
                 End();
1090
                 End();
1091
+                APP.W_PracticeWindow.ReturnPractice();
1089
                 if (APP.W_PracticeWindow != null)
1092
                 if (APP.W_PracticeWindow != null)
1090
                 {
1093
                 {
1091
                     if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
1094
                     if (APP.W_PracticeWindow.Visibility == Visibility.Visible)

+ 1
- 1
XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs View File

69
             string videoName = FileToolsCommon.GetIOFileNameNoExtension(VideoModel.VideoPath);
69
             string videoName = FileToolsCommon.GetIOFileNameNoExtension(VideoModel.VideoPath);
70
             TbName.Text = videoName.Length > 11 ? videoName.Substring(0, 11) + "..." : videoName;
70
             TbName.Text = videoName.Length > 11 ? videoName.Substring(0, 11) + "..." : videoName;
71
             TbName.ToolTip = videoName;
71
             TbName.ToolTip = videoName;
72
-            lblDateSize.Content = VideoModel.RSTime + "|" + VideoModel.VideoSize;
72
+            lblDateSize.Content = VideoModel.RSTime + " " + VideoModel.VideoSize;
73
             if (VideoModel.IsUpload)
73
             if (VideoModel.IsUpload)
74
             {
74
             {
75
                 //BtnUpload.Visibility = Visibility.Hidden;
75
                 //BtnUpload.Visibility = Visibility.Hidden;

+ 15
- 2
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

938
 
938
 
939
             //imgCanvas.Source = new BitmapImage(new Uri(desktopPath));
939
             //imgCanvas.Source = new BitmapImage(new Uri(desktopPath));
940
         }
940
         }
941
+        public void WindowType()
942
+        {
943
+            if (WindowState == WindowState.Minimized)//截图完恢复窗口
944
+            {
945
+                Topmost = true;
946
+                WindowState = WindowState.Normal;
947
+            }
948
+        }
941
         /// <summary>
949
         /// <summary>
942
         /// 截图关闭窗口
950
         /// 截图关闭窗口
943
         /// </summary>
951
         /// </summary>
992
                         imgCanvas.Source = bitImg;
1000
                         imgCanvas.Source = bitImg;
993
                         imgCanvas.Width = bitImg.Width;
1001
                         imgCanvas.Width = bitImg.Width;
994
                         imgCanvas.Height = bitImg.Height;
1002
                         imgCanvas.Height = bitImg.Height;
1003
+                        scroMain.ScrollToVerticalOffset(0);
995
                         APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform
1004
                         APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform
996
                         {
1005
                         {
997
                             CenterX = imgCanvas.Width,
1006
                             CenterX = imgCanvas.Width,
1042
                 string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
1051
                 string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
1043
                 ofd = new System.Windows.Forms.OpenFileDialog
1052
                 ofd = new System.Windows.Forms.OpenFileDialog
1044
                 {
1053
                 {
1045
-                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
1046
-                    //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
1054
+                    //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
1055
+                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
1047
                     InitialDirectory = desktopPath,
1056
                     InitialDirectory = desktopPath,
1048
                     Multiselect = false,
1057
                     Multiselect = false,
1049
                     AddExtension = true,
1058
                     AddExtension = true,
1197
                                     btnScreenshot.IsEnabled = false;
1206
                                     btnScreenshot.IsEnabled = false;
1198
                                     imgDocumentation.Source = null;
1207
                                     imgDocumentation.Source = null;
1199
                                     imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
1208
                                     imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
1209
+                                    scroMain.ScrollToVerticalOffset(0);
1200
                                     for (int i = iStart; i < iEnd; i++)
1210
                                     for (int i = iStart; i < iEnd; i++)
1201
                                     {
1211
                                     {
1202
                                         APP.PageDrawList[i].ImageLocation = new TranslateTransform
1212
                                         APP.PageDrawList[i].ImageLocation = new TranslateTransform
1328
                                     btnScreenshot.IsEnabled = false;
1338
                                     btnScreenshot.IsEnabled = false;
1329
                                     imgDocumentation.Source = null;
1339
                                     imgDocumentation.Source = null;
1330
                                     imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
1340
                                     imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
1341
+                                    scroMain.ScrollToVerticalOffset(0);
1331
                                     for (int i = iStart; i < iEnd; i++)
1342
                                     for (int i = iStart; i < iEnd; i++)
1332
                                     {
1343
                                     {
1333
                                         APP.PageDrawList[i].ImageLocation = new TranslateTransform
1344
                                         APP.PageDrawList[i].ImageLocation = new TranslateTransform
1420
                                     btnScreenshot.IsEnabled = false;
1431
                                     btnScreenshot.IsEnabled = false;
1421
                                     imgDocumentation.Visibility = Visibility.Visible;
1432
                                     imgDocumentation.Visibility = Visibility.Visible;
1422
                                     imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
1433
                                     imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
1434
+                                    scroMain.ScrollToVerticalOffset(0);
1423
                                 }
1435
                                 }
1424
                                 else
1436
                                 else
1425
                                 {
1437
                                 {
3499
             gridPage.Visibility = Visibility.Visible;//页码大于0 显示
3511
             gridPage.Visibility = Visibility.Visible;//页码大于0 显示
3500
             APP.pageData.currpage = APP.pageData.pagenum;
3512
             APP.pageData.currpage = APP.pageData.pagenum;
3501
             myblackboard.changepage(APP.pageData.currpage - 1);
3513
             myblackboard.changepage(APP.pageData.currpage - 1);
3514
+            scroMain.ScrollToVerticalOffset(0);
3502
             ///清空页面图片UI
3515
             ///清空页面图片UI
3503
             imgCanvas.Source = null;
3516
             imgCanvas.Source = null;
3504
             imgDocumentation.Source = null;
3517
             imgDocumentation.Source = null;

Loading…
Cancel
Save