正式环境发版 3.9.2

XHWK.WKTool/App.config

@@ -5,12 +5,12 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
+    <add key="IsDebug" value="0" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="118" />
-    <add key="VersionName" value="3.9.1" />
+    <add key="VersionCode" value="119" />
+    <add key="VersionName" value="3.9.2" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/MainWindow.xaml

@@ -102,9 +102,7 @@
                 Background="White"
                 MouseLeftButtonDown="Window_MouseLeftButtonDown">
                 <Grid Background="{DynamicResource BackTitle}">
-                    <!--<Grid.Background>
-                            <ImageBrush ImageSource="" />
-                        </Grid.Background>-->
+
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="200*" />
                         <ColumnDefinition Width="926*" />
@@ -670,7 +668,7 @@
                                         </Grid>
                                     </ScrollViewer>
                                     <Image
-                                        x:Name="ImgPlayerLeft"
+                                        x:Name="HeadImg"
                                         Width="172"
                                         Height="124"
                                         Margin="10,7,10,10"
@@ -683,46 +681,6 @@
                                         </Image.RenderTransform>
                                     </Image>
 
-
-                                    <Image
-                                        x:Name="ImgPlayerRight"
-                                        Width="172"
-                                        Height="124"
-                                        Margin="10,7,26,10"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Top"
-                                        RenderTransformOrigin="0.5,0.5"
-                                        Visibility="Collapsed">
-                                        <Image.RenderTransform>
-                                            <ScaleTransform ScaleX="-1" />
-                                        </Image.RenderTransform>
-                                    </Image>
-                                    <Image
-                                        x:Name="ImgPlayerLeftUnder"
-                                        Width="172"
-                                        Height="124"
-                                        Margin="10,7,10,10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Bottom"
-                                        RenderTransformOrigin="0.5,0.5"
-                                        Visibility="Collapsed">
-                                        <Image.RenderTransform>
-                                            <ScaleTransform ScaleX="-1" />
-                                        </Image.RenderTransform>
-                                    </Image>
-                                    <Image
-                                        x:Name="ImgPlayerRightUnder"
-                                        Width="172"
-                                        Height="124"
-                                        Margin="10,7,26,10"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Bottom"
-                                        RenderTransformOrigin="0.5,0.5"
-                                        Visibility="Collapsed">
-                                        <Image.RenderTransform>
-                                            <ScaleTransform ScaleX="-1" />
-                                        </Image.RenderTransform>
-                                    </Image>
                                 </Grid>
                             </Border>
                         </Grid>

XHWK.WKTool/MainWindow.xaml.cs

@@ -152,21 +152,26 @@ namespace XHWK.WKTool
 
         private void LoadImage(BitmapImage image)
         {
+            HeadImg.Source = image;
             try
             {
                 switch (APP.CameraPosition)
                 {
                     case "1":
-                        ImgPlayerRight.Source = image;
+                        HeadImg.HorizontalAlignment = HorizontalAlignment.Right;
+                        HeadImg.VerticalAlignment = VerticalAlignment.Top;
                         break;
                     case "2":
-                        ImgPlayerLeft.Source = image;
+                        HeadImg.HorizontalAlignment = HorizontalAlignment.Left;
+                        HeadImg.VerticalAlignment = VerticalAlignment.Top;
                         break;
                     case "3":
-                        ImgPlayerRightUnder.Source = image;
+                        HeadImg.HorizontalAlignment = HorizontalAlignment.Right;
+                        HeadImg.VerticalAlignment = VerticalAlignment.Bottom;
                         break;
                     case "4":
-                        ImgPlayerLeftUnder.Source = image;
+                        HeadImg.HorizontalAlignment = HorizontalAlignment.Left;
+                        HeadImg.VerticalAlignment = VerticalAlignment.Bottom;
                         break;
                 }
             }
@@ -475,10 +480,11 @@ namespace XHWK.WKTool
                 GridM.IsEnabled = true;
                 GridRecordingTitle.Visibility = Visibility.Visible;
                 GridSetUp.Visibility = Visibility.Collapsed;
-                ImgPlayerRight.Visibility = Visibility.Collapsed;
-                ImgPlayerLeft.Visibility = Visibility.Collapsed;
-                ImgPlayerRightUnder.Visibility = Visibility.Collapsed;
-                ImgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                HeadImg.Visibility = Visibility.Hidden;
+                if (_isRbnOpen)
+                {
+                    HeadImg.Visibility = Visibility.Visible;
+                }
                 if (!TxbStoragePath.Content.ToString().Equals(APP.WKData.WkPath))
                 {
                     //存储文件
@@ -662,7 +668,7 @@ namespace XHWK.WKTool
         private bool _isHasCode;
 
         /// <summary>
-        /// 增加事件
+        /// 加页事件
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -671,7 +677,7 @@ namespace XHWK.WKTool
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
             _luoBoPenUtil.lb_device_hand();
-            Record();
+            PrepareRecord();
             if (APP.PageContextData.currpage > 0)
             {
                 APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = true;
@@ -707,10 +713,6 @@ namespace XHWK.WKTool
                 //截图可用
                 BtnScreenshot.IsEnabled = true;
             }
-
-            #region 插入页码
-
-            #endregion 插入页码
         }
 
         /// <summary>
@@ -935,7 +937,7 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private async void RbnOpen_Click(object sender, RoutedEventArgs e)
+        private void RbnOpen_Click(object sender, RoutedEventArgs e)
         {
             if (!_isRbnOpen)
             {
@@ -946,8 +948,14 @@ namespace XHWK.WKTool
                     return;
                 }
                 _isPressButton = true;
-                await Task.Delay(500);
-                _isPressButton = false;
+                Task.Run
+                (
+                    () =>
+                    {
+                        Thread.Sleep(3000);
+                        _isPressButton = false;
+                    }
+                );
 
                 #endregion 防止连击
 
@@ -968,6 +976,12 @@ namespace XHWK.WKTool
                     }
                     CameraHelper.imageCallback = LoadImage;
                     CameraHelper.StartCameraDevice(cameraIndex, this.Dispatcher);
+                    if (_timer != null)
+                    {
+                        _times.Elapsed -= Times_Elapsed;
+                        _times.Enabled = false;
+                        _times.Dispose();
+                    }
                     _times = new System.Timers.Timer(200) //初始值为300
                     {
                         AutoReset = true //设置是否执行System.Timers.Timer.Elapsed事件
@@ -977,45 +991,42 @@ namespace XHWK.WKTool
                     _isRbnOpen = true;
                     string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
                     FileToolsCommon.CreateDirectory(imgPath);
-
+                    HeadImg.Visibility = Visibility.Visible;
                     // < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
-                    if ("1".Equals(APP.CameraPosition))
-                    {
-                        ImgPlayerRight.Visibility = Visibility.Visible;
-                        ImgPlayerLeft.Visibility = Visibility.Hidden;
-                        ImgPlayerRightUnder.Visibility = Visibility.Hidden;
-                        ImgPlayerLeftUnder.Visibility = Visibility.Hidden;
-                    }
-                    else if ("2".Equals(APP.CameraPosition))
+                    switch (APP.CameraPosition)
                     {
-                        ImgPlayerRight.Visibility = Visibility.Hidden;
-                        ImgPlayerLeft.Visibility = Visibility.Visible;
-                        ImgPlayerRightUnder.Visibility = Visibility.Hidden;
-                        ImgPlayerLeftUnder.Visibility = Visibility.Hidden;
-                    }
-                    else if ("3".Equals(APP.CameraPosition))
-                    {
-                        ImgPlayerRight.Visibility = Visibility.Hidden;
-                        ImgPlayerLeft.Visibility = Visibility.Hidden;
-                        ImgPlayerRightUnder.Visibility = Visibility.Visible;
-                        ImgPlayerLeftUnder.Visibility = Visibility.Hidden;
-                    }
-                    else if ("4".Equals(APP.CameraPosition))
-                    {
-                        ImgPlayerRight.Visibility = Visibility.Hidden;
-                        ImgPlayerLeft.Visibility = Visibility.Hidden;
-                        ImgPlayerRightUnder.Visibility = Visibility.Hidden;
-                        ImgPlayerLeftUnder.Visibility = Visibility.Visible;
-                    }
-                    else
-                    {
-                        ImgPlayerLeft.Visibility = Visibility.Hidden;
-                        ImgPlayerRightUnder.Visibility = Visibility.Hidden;
-                        ImgPlayerLeftUnder.Visibility = Visibility.Hidden;
+                        case "1":
+                            HeadImg.HorizontalAlignment = HorizontalAlignment.Right;
+                            HeadImg.VerticalAlignment = VerticalAlignment.Top;
+                            break;
+                        case "2":
+                            HeadImg.HorizontalAlignment = HorizontalAlignment.Left;
+                            HeadImg.VerticalAlignment = VerticalAlignment.Top;
+                            break;
+                        case "3":
+                            HeadImg.HorizontalAlignment = HorizontalAlignment.Right;
+                            HeadImg.VerticalAlignment = VerticalAlignment.Bottom;
+                            break;
+                        case "4":
+                            HeadImg.HorizontalAlignment = HorizontalAlignment.Left;
+                            HeadImg.VerticalAlignment = VerticalAlignment.Bottom;
+                            break;
                     }
                     RbnTurnOff.IsEnabled = false;
-                    await Task.Delay(2000);
-                    RbnTurnOff.IsEnabled = true;
+                    Task.Run
+                    (
+                        () =>
+                        {
+                            Thread.Sleep(3000);
+                            Dispatcher.Invoke
+                            (
+                                () =>
+                                {
+                                    RbnTurnOff.IsEnabled = true;
+                                }
+                            );
+                        }
+                    );
                 }
             }
         }
@@ -1027,7 +1038,7 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private async void RbnTurnOff_Click(object sender, RoutedEventArgs e)
+        private void RbnTurnOff_Click(object sender, RoutedEventArgs e)
         {
             if (_isRbnOpen)
             {
@@ -1038,19 +1049,29 @@ namespace XHWK.WKTool
                     return;
                 }
                 _isPressButton = true;
-                await Task.Delay(500);
-                _isPressButton = false;
+                Task.Run
+                (
+                    () =>
+                    {
+                        Thread.Sleep(500);
+                        _isPressButton = false;
+                    }
+                );
 
                 #endregion 防止连击
 
                 _isRbnOpen = false;
-                ImgPlayerRight.Visibility = Visibility.Hidden;
-                ImgPlayerLeft.Visibility = Visibility.Hidden;
-                ImgPlayerRightUnder.Visibility = Visibility.Hidden;
-                ImgPlayerLeftUnder.Visibility = Visibility.Hidden;
+                HeadImg.Visibility = Visibility.Hidden;
                 RbnOpen.IsEnabled = false;
                 CameraHelper.CloseDevice();
                 RbnOpen.IsEnabled = true;
+                if (_timer != null)
+                {
+                    _times.Elapsed -= Times_Elapsed;
+                    _times.Enabled = false;
+                    _times.Dispose();
+                    _times = null;
+                }
             }
         }
 
@@ -1331,7 +1352,7 @@ namespace XHWK.WKTool
         {
             try
             {
-                Record();
+                PrepareRecord();
                 HideAngleBorder();
                 string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
                 _ofd = new System.Windows.Forms.OpenFileDialog
@@ -1361,7 +1382,7 @@ namespace XHWK.WKTool
         /// </param>
         private void BtnScreenshot_Click(object sender, RoutedEventArgs e)
         {
-            Record();
+            PrepareRecord();
             HideAngleBorder();
             ImgCanvas.Margin = new Thickness
             (
@@ -2381,7 +2402,7 @@ namespace XHWK.WKTool
                 MessageWindow.Show("扬声器不可用");
                 return;
             }
-            Record();
+            PrepareRecord();
             _kHook.Stop();
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
@@ -2511,18 +2532,15 @@ namespace XHWK.WKTool
             {
                 return;
             }
-            else
-            {
-                _isPressButton = true;
-                new Thread
-                (
-                    () =>
-                    {
-                        Thread.Sleep(500);
-                        _isPressButton = false;
-                    }
-                ).Start();
-            }
+            _isPressButton = true;
+            new Thread
+            (
+                () =>
+                {
+                    Thread.Sleep(500);
+                    _isPressButton = false;
+                }
+            ).Start();
 
             #endregion 防止连击
 
@@ -2549,7 +2567,7 @@ namespace XHWK.WKTool
                 {
                     HideAngleBorder();
                 }
-                Record();
+                PrepareRecord();
                 BtnPrint.IsEnabled = false;
                 BtnScreenshot.IsEnabled = false;
                 BtnImport.IsEnabled = false;
@@ -3378,7 +3396,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 录屏 录制 截图 导入文档 增加 主页面显示
         /// </summary>
-        private void Record()
+        private void PrepareRecord()
         {
             PageHide();
             GridMain.Visibility = Visibility.Visible;

星火微课/星火微课-正式.iss

@@ -3,10 +3,10 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.9.0"
+#define MyAppVersion "3.9.2"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
-#define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
+#define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"
 #define MyAppExeName "星火微课.exe"
 #define MyIcoName "256.ico"
 #define MyTargetPath "D:\程序打包\星火微课-正式\"

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.9.1"
+#define MyAppVersion "3.9.2"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"