主页面样式

Common/system/BlackboardNew.cs

@@ -287,7 +287,7 @@ namespace Common.system
                     stylusPoint.X = 581;
                     stylusPoint.Y = 213;
                     stylusPoints.Add(stylusPoint);
-                     stroke = new Stroke(stylusPoints);
+                    stroke = new Stroke(stylusPoints);
 
                     stylusPoint.X = 586;
                     stylusPoint.Y = 214;
@@ -316,6 +316,44 @@ namespace Common.system
                     m_canvas.Strokes.Add(stroke);
                 }
             }
+        }
+        StylusPointCollection stylusPoints = new StylusPointCollection();
+        StylusPoint stylusPoint = new StylusPoint();
+        Stroke stroke;
+        public void changepages(double _x, double _y, bool _new)
+        {
+            if (_new)
+            {
+                if(stroke!=null&&stroke.StylusPoints.Count > 1)
+                {
+                    m_canvas.Strokes.Add(stroke);
+                   
+                }
+            
+                stylusPoints = new StylusPointCollection();
+                stylusPoint = new StylusPoint();
+                //stroke = new Stroke(stylusPoints);
+                stroke=null;
+            }
+            else
+            {
+                //stylusPoints = new StylusPointCollection();
+                //stylusPoint = new StylusPoint();
+                stylusPoint.X = _x;
+                stylusPoint.Y = _y;
+                stylusPoints.Add(stylusPoint);
+                stroke = new Stroke(stylusPoints);
+            }
+           
+
+            //page.lines.Last().lines_curr.Add();
+            //if (stroke.StylusPoints.Count > 20)
+            //{
+              
+            
+
+
+
         }
     }
 }

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -107,7 +107,7 @@ namespace XHWK.WKTool
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
-            APP.W_XHMicroLessonSystemWindow.Show();
+            APP.W_XHMicroLessonSystemWindow.ShowDialog();
             this.Hide();
         }
         /// <summary>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -7,14 +7,15 @@
         xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="XHMicroLessonSystemWindow" Height="930" Width="1162.5" WindowStartupLocation="CenterOwner"
-    WindowStyle="None" Background="#EFF1F8"   AllowsTransparency="True" 
-    ShowInTaskbar="False">
+        Title="XHMicroLessonSystemWindow" Height="1040.8" Width="875" WindowStartupLocation="CenterScreen"
+    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8"
+   >
+    
     <Viewbox>
-        <Grid Height="930" Width="1162.5">
+        <Grid Height="1040.8" Width="875">
             <!--分3行-->
             <Grid.RowDefinitions>
-                <RowDefinition Height="106"/>
+                <RowDefinition Height="94"/>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="30"/>
             </Grid.RowDefinitions>
@@ -24,18 +25,18 @@
                     <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>
                 <!--第一行-->
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,10,10,0">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,2,10,0">
                     <Image Source="./Images/microLessonSystem_0.png"/>
                     <TextBlock Text="星火微课系统" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
                 </StackPanel>
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,10,0">
                     <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
                         <StackPanel Orientation="Horizontal">
                             <Image Source="./Images/microLessonSystem_9.png"/>
                             <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                    <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click">
                         <Image Source="./Images/microLessonSystem_19.png"/>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
@@ -46,7 +47,7 @@
                     </Button>
                 </StackPanel>
                 <!--第二行-->
-                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,10,0,0">
+                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,2,0,0">
                     <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
@@ -122,7 +123,7 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain"  Margin="20,0,20,0" Background="#FFFFFF" Height="793.700787401575" Width="1142.51968503937" Visibility="Visible">
+            <Grid Grid.Row="1" x:Name="GridMain"  Margin="0,0,0,0" Background="#FFFFFF" Width="635" Height="914" Visibility="Visible">
                 <Label Content="" Grid.Column="0" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
                 <Grid>
                     <Border Grid.Row="1"  CornerRadius="5">
@@ -152,9 +153,9 @@
                 <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
                     <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
                 </wfi:WindowsFormsHost>-->
-                <Image x:Name="imgPlayer" Width="172" Height="124"  HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top"/>
+                <Image x:Name="imgPlayer" Width="172" Height="124"  HorizontalAlignment="Right" Margin="0,7,10,0" VerticalAlignment="Top" Visibility="Collapsed"/>
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Right"
-            Height="58" Margin="0,718,50,0" Grid.Column="1">
+            Height="58" Margin="0,830,20,0" Grid.Column="1">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"
                     Width="60"
@@ -198,8 +199,8 @@
                     </Button>
                 </StackPanel>
 
-                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,21,0"/>
-                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,21,0"/>
+                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,2,0"/>
+                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,2,0"/>
             </Grid>
             <!--设置-->
             <Grid Grid.Row="1" x:Name="gridSetUp" Margin="20,0,20,0" Background="#FFFFFF" Visibility="Collapsed">
@@ -215,7 +216,7 @@
                 </Grid.RowDefinitions>
                 <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,30,0,0">
                     <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0"/>
-                    <TextBlock Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
+                    <TextBlock x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left">
                     <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0"/>
@@ -239,10 +240,10 @@
                     <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Foreground="#2D8CF0" Padding="2,36,10,0"/>
                     <!--输入框-->
                     <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
-                        <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                        <Label x:Name="txbStoragePath" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
                     </Border>
                     <!--浏览按钮-->
-                    <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+                    <Button Cursor="Hand" x:Name="btnBrowse" Content="打开" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border
@@ -285,7 +286,7 @@
                     </Button.Template>
                 </Button>
             </Grid>
-            <Grid Grid.Row="2">
+            <Grid Grid.Row="2" Background="#EFF1F8">
                 <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
                     <TextBlock Text="颜色：" FontSize="14" Padding="5,5,0,0"/>
                     <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -64,7 +64,7 @@ namespace XHWK.WKTool
             APP.pageData.currpage = 1;
             DataContext = APP.pageData;
 
-            txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoType");
+            txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
             if (FileToolsCommon.GetConfigValue("IsSound").Equals("true"))
             {
                 rbnY.IsChecked = true;
@@ -73,7 +73,7 @@ namespace XHWK.WKTool
             {
                 rbnN.IsChecked = true;
             }
-            txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
+            txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
             InitPen();
         }
@@ -134,7 +134,7 @@ namespace XHWK.WKTool
             if (CameraHelper.CameraDevices.Count > 0)
             {
                 CameraHelper.SetCameraDevice(0);
-                //wfhCamera.Visibility = Visibility.Hidden;
+                imgPlayer.Visibility = Visibility.Visible;
                 RbnOpen = new List<string>();
                 times = new System.Timers.Timer(200);//设置执行一次（false）还是一直执行(true)
                 times.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
@@ -143,11 +143,8 @@ namespace XHWK.WKTool
 
                 IsRbnOpen = true;
             }
-
-        
         }
 
-
         int I = 9999;
         private void Times_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
@@ -157,17 +154,17 @@ namespace XHWK.WKTool
                 {
                     Dispatcher.Invoke(() =>
                     {
-                        if(I>10006)
+                        if(I>10010)
                         {
+                            long time = Timestamp();
                             //string FilePathName = ImgPath + RsImgName.Count + ".png";
-                            string path = CameraHelper.CaptureImage(@"G:\103", I.ToString());
+                            string path = CameraHelper.CaptureImage(@"G:\103", time.ToString());
                             if (!string.IsNullOrWhiteSpace(path))
                             {
                                 RbnOpen.Add(path);
                                 imgPlayer.Source = new BitmapImage(new Uri(path));
                             }
                         }
-                     
                         I++;
                     });
                 }
@@ -185,8 +182,9 @@ namespace XHWK.WKTool
         private void RbnTurnOff_Click(object sender, RoutedEventArgs e)
         {
             IsRbnOpen = false;
-            //wfhCamera.Visibility = Visibility.Hidden;
+            imgPlayer.Visibility = Visibility.Hidden;
             CameraHelper.CloseDevice();
+            I = 9999;
         } 
         #endregion
         #endregion
@@ -255,33 +253,33 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSave_Click(object sender, RoutedEventArgs e)
         {
-            #region 合法性判断
-            if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
-            {
-                System.Windows.MessageBox.Show("路径不可为空！");
-                return;
-            }
-            string temp = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + APP.WKData.WkName.Trim() + "/";
-            if (!APP.WKData.WkPath.Equals(temp))
-            {
-                APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + APP.WKData.WkName.Trim() + "/";
-                if (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath))
-                {
-                    //微课已存在
-                    MessageBoxResult dr = System.Windows.MessageBox.Show("讲解已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                    if (dr == MessageBoxResult.OK)
-                    {
-                        FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-                    }
-                    else
-                    {
-                        return;
-                    }
-                }
-                //创建文件夹
-                FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-            }
-            #endregion
+            //#region 合法性判断
+            //if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
+            //{
+            //    System.Windows.MessageBox.Show("路径不可为空！");
+            //    return;
+            //}
+            //string temp = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + APP.WKData.WkName.Trim() + "/";
+            //if (!APP.WKData.WkPath.Equals(temp))
+            //{
+            //    APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + APP.WKData.WkName.Trim() + "/";
+            //    if (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath))
+            //    {
+            //        //微课已存在
+            //        MessageBoxResult dr = System.Windows.MessageBox.Show("讲解已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+            //        if (dr == MessageBoxResult.OK)
+            //        {
+            //            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
+            //        }
+            //        else
+            //        {
+            //            return;
+            //        }
+            //    }
+            //    //创建文件夹
+            //    FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+            //}
+            //#endregion
 
 
             if (rbnMP4.IsChecked == true)
@@ -317,6 +315,7 @@ namespace XHWK.WKTool
         {
             GridMain.Visibility = Visibility.Collapsed;
             gridSetUp.Visibility = Visibility.Visible;
+            txbStoragePath.Content = APP.WKData.WkPath;
         }
         /// <summary>
         /// 设置 浏览事件
@@ -325,20 +324,25 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrowse_Click(object sender, RoutedEventArgs e)
         {
-            string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-            Ofd = new System.Windows.Forms.FolderBrowserDialog();
 
-            Result = Ofd.ShowDialog();
-            if (Result == System.Windows.Forms.DialogResult.OK)
-            {
-                if (Ofd.SelectedPath != "")
-                {
-                    txbStoragePath.Text = Ofd.SelectedPath;
-                    //string ApplicationData = ZConfig.dataPath + "fileStorageAddress.txt";
-                    //string temp = ofd.SelectedPath;
-                    //System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-                }
-            }
+
+            System.Diagnostics.Process.Start(APP.WKData.WkPath);
+            //string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+            //Ofd = new System.Windows.Forms.FolderBrowserDialog();
+
+            //Result = Ofd.ShowDialog();
+            //if (Result == System.Windows.Forms.DialogResult.OK)
+            //{
+            //    if (Ofd.SelectedPath != "")
+            //    {
+
+
+            //        //txbStoragePath.Text = Ofd.SelectedPath;
+            //        //string ApplicationData = ZConfig.dataPath + "fileStorageAddress.txt";
+            //        //string temp = ofd.SelectedPath;
+            //        //System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+            //    }
+            //}
         }
         /// <summary>
         /// 画笔颜色事件 白色
@@ -1439,6 +1443,7 @@ namespace XHWK.WKTool
                 //labPenStatus.Text = "PenDown";
                 isPenDown = true;
             }
+            //myblackboard.changepages(0, 0, true);
         }
 
         /// <summary>
@@ -1469,6 +1474,11 @@ namespace XHWK.WKTool
                 //}
                 stroke.Clear();
             }
+            Dispatcher.Invoke(new Action(() =>
+            {
+                myblackboard.changepages(0, 0, true);
+            }));
+          
         }
 
         /// <summary>
@@ -1488,6 +1498,12 @@ namespace XHWK.WKTool
             {
                 APP.PenSerial = penSerial;
                 APP.PenStatus = false;
+           
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbNotConnected.Text = "未连接";
+                    txbNotConnecteds.Text = "未连接";
+                }));
             }
         }
 
@@ -1514,6 +1530,12 @@ namespace XHWK.WKTool
 
                 //开始接收笔数据
                 APP.digitalPen.GetPenData(penSerial);
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbNotConnected.Text = "已连接";
+                    txbNotConnecteds.Text = "已连接";
+                }));
+              
             }
         }
         /// <summary>
@@ -1589,7 +1611,12 @@ namespace XHWK.WKTool
                 double testY=(double)cy * PropH;
                 //pageSerial //点阵IP地址  与打印的页面关联
 
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    myblackboard.changepages(testX, testY,false);
+                }));
 
+             
                 ////每3个点画一条曲线
                 //if (stroke.Count % 3 == 0)
                 //{
@@ -1654,5 +1681,17 @@ namespace XHWK.WKTool
                 APP.digitalPen.SetPenHoverMode(false, penSerial);
         }
         #endregion
+        /// <summary>
+        /// 最小化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnShrink_Click(object sender, RoutedEventArgs e)
+        {
+            if(Visibility== Visibility.Hidden)
+            Visibility = Visibility.Visible;
+            else
+                Visibility = Visibility.Hidden;
+        }
     }
 }