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

XHWK.WKTool/App.config

@@ -34,8 +34,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="29" />
-    <add key="VersionName" value="1.2.8" />
+    <add key="VersionCode" value="30" />
+    <add key="VersionName" value="1.2.9" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.8.0")]
-[assembly: AssemblyFileVersion("1.2.8.0")]
+[assembly: AssemblyVersion("1.2.9.0")]
+[assembly: AssemblyFileVersion("1.2.9.0")]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -255,7 +255,7 @@
                     <TextBlock x:Name="txbTime" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="1" HorizontalAlignment="Center">
-                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="0,25,0,0"/>
+                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="60,25,0,0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,5">
                     <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -346,21 +346,34 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void RbnOpen_Click(object sender, RoutedEventArgs e)
         {
-            //UCCamera win = new UCCamera();
-            ////win.Topmost = true;
-            //win.ShowDialog();
+            if (!IsRbnOpen)
+            {
+                #region 防止连击
+                if (IsPressButton)
+                {
+                    return;
+                }
+                else
+                {
+                    IsPressButton = true;
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        //Dispatcher.Invoke(new Action(() => { rbnTurnOff.IsEnabled = false; }));
 
+                        Thread.Sleep(500);
+                        //Dispatcher.Invoke(new Action(() => { rbnTurnOff.IsEnabled = true; }));
 
+                        IsPressButton = false;
+                    }))).Start();
+                }
+                #endregion
 
-            //wfhCamera.Visibility = Visibility.Visible;
-            //CameraHelper.IsDisplay = true;
-            //CameraHelper.SourcePlayer = player;
-            CameraHelper.UpdateCameraDevices();
+                CameraHelper.UpdateCameraDevices();
             if (CameraHelper.CameraDevices.Count > 0)
             {
                 CameraHelper.SetCameraDevice(0);
                 RbnOpen = new List<string>();
-                times = new System.Timers.Timer(100)//初始值为300
+                times = new System.Timers.Timer(200)//初始值为300
                 {
                     AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
                 };//设置执行一次（false）还是一直执行(true)
@@ -372,6 +385,7 @@ namespace XHWK.WKTool
                 string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
                 FileToolsCommon.CreateDirectory(imgPath);
             }
+            }
         }
 
         private int I = 9999;
@@ -451,13 +465,35 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void RbnTurnOff_Click(object sender, RoutedEventArgs e)
         {
-            IsRbnOpen = false;
+            if(IsRbnOpen)
+            {
+                #region 防止连击
+                if (IsPressButton)
+                {
+                    return;
+                }
+                else
+                {
+                    IsPressButton = true;
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        //Dispatcher.Invoke(new Action(() => { rbnOpen.IsEnabled = false; }));
+
+                        Thread.Sleep(500);
+                        //Dispatcher.Invoke(new Action(() => { rbnOpen.IsEnabled = true; }));
+
+                        IsPressButton = false;
+                    }))).Start();
+                }
+                #endregion
+                IsRbnOpen = false;
             imgPlayerRight.Visibility = Visibility.Collapsed;
             imgPlayerLeft.Visibility = Visibility.Collapsed;
             imgPlayerRightUnder.Visibility = Visibility.Collapsed;
             imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
             CameraHelper.CloseDevice();
             I = 9999;
+            }
         }
         #endregion
         #endregion