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

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -22,7 +22,7 @@ namespace XHWK.WKTool
     {
         //声明一个 DrawingAttributes 类型的变量  
         private DrawingAttributes drawingAttributes;
-
+        private DrawingAttributes drawing;
         private ViewModel viewModel;
         /// <summary>
         /// 0 画笔 1 矩形 2 圆形 
@@ -108,9 +108,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Red()
         {
-            //flg = 0;
-            //设置 DrawingAttributes 的 Color 属性设置颜色  
-            drawingAttributes.Color = Colors.Red;
+                drawingAttributes.Color = Colors.Red;
             Colour = Colors.Red;
         }
         /// <summary>
@@ -562,6 +560,13 @@ namespace XHWK.WKTool
             //}
 
 
+                if (strokes != null && strokes.StylusPoints.Count > 1)
+                {
+                    isFirst = true;
+                }
+                stylusPoints = new StylusPointCollection();
+                stylusPoint = new StylusPoint();
+                strokes = null;
         }
 
         /// <summary>
@@ -694,26 +699,88 @@ namespace XHWK.WKTool
                 double testX = cy * PropW;
                 double testY = (A4_WIDTH - cx) * PropH;
                 //pageSerial //点阵IP地址  与打印的页面关联
-                if (APP.pageData.currpage > 0)
+                if (true)
                 {
                     Dispatcher.Invoke(new Action(() =>
                     {
                         float Pressure = force / 100f;
-                        //添加笔画
+                        ////添加笔画
                         //myblackboard.changepages(testX, testY, false, Color, PenSize, APP.pageData.currpage - 1, Pressure);
 
+                        if (isFirst)
+                        {
+                            stylusPoint.X = testX;
+                            stylusPoint.Y = testY;
+                            //_color.A = (byte)(Pressure * 255f);
+                            //stylusPoint.PressureFactor = Pressure;
+
+                            //for(int i=0;i<100;i++)
+                            //{
+                            //    stylusPoint.X--;
+                            //    stylusPoint.Y--;
+                            //    stylusPoints.Add(stylusPoint);
+                            //}
+                            stylusPoints.Add(stylusPoint);
+                            if (stylusPoints.Count > 1)
+                            {
+                                drawing = new DrawingAttributes
+                                {
+                                    Color = Colour,
+                                    Width = Wit * 4.5,
+                                    Height = Wit * 4.5,
+                                    FitToCurve = true,
+                                    IgnorePressure = false
+                                };
+                            
+                                //blackboard_canvas.Strokes = new StrokeCollection();
+                                strokes = new Stroke(stylusPoints);
+
+                             
+                                strokes.DrawingAttributes = drawing;
+                                //blackboard_canvas.Strokes.Add(strokes);
+
+                                blackboard_canvas.Strokes.Add(strokes);
+                                isFirst = false;
+                            }
+                        }
+                        else
+                        {
+                            if (blackboard_canvas.Strokes.Count>0)
+                            {
+                                stylusPoint.X = testX;
+                                stylusPoint.Y = testY;
+                                stylusPoints.Add(stylusPoint);
+                                strokes = new Stroke(stylusPoints);
+                                drawing = new DrawingAttributes
+                                {
+                                    Color = Colour,
+                                    Width = Wit * 4.5,
+                                    Height = Wit * 4.5,
+                                    FitToCurve = true,
+                                    IgnorePressure = false
+                                };
+                                strokes.DrawingAttributes = drawing;
+
+                                //viewModel.InkStrokes.Add(strokes);
+                                blackboard_canvas.Strokes[blackboard_canvas.Strokes.Count - 1] = strokes;
+                            }
+                        }
+
                         //设置鼠标位置
                         if (testX > 0 && testY > 0)
                         {
                             //System.Windows.Point getP = scroMain.PointToScreen(new System.Windows.Point(testX, testY - scroMain.VerticalOffset));
-                            SetCursorPos((int)testX, (int)testY);
+                            SetCursorPos((int)((float)testX* (PrimaryScreen.DpiX / 96f)), (int)((float)testY* (PrimaryScreen.DpiY / 96f)));
                         }
                     }));
                 }
 
             }
         }
-
+        bool isFirst = true;
+        private StylusPointCollection stylusPoints = new StylusPointCollection();
+        private StylusPoint stylusPoint = new StylusPoint();
+        private Stroke strokes;
         /// <summary>
         /// 停止笔
         /// </summary>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -377,6 +377,7 @@
                         <RowDefinition Height="50"/>
                         <RowDefinition Height="50"/>
                         <RowDefinition Height="50"/>
+                        <RowDefinition Height="50"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
@@ -394,14 +395,23 @@
                         <RadioButton x:Name="rbnAVI" Cursor="Hand" Style="{StaticResource radBase}" Content=" AVI" FontSize="14" Foreground="#333333" Margin="20,-26,0,0" Visibility="Collapsed"/>
                     </StackPanel>
 
-                    <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" HorizontalAlignment="Right"/>
+
+                    <TextBlock Grid.Row="2" Grid.Column="0" Text="录屏工具栏" FontSize="16" Foreground="#333333" HorizontalAlignment="Right"/>
                     <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                        <RadioButton x:Name="rbnHide"  Cursor="Hand" Style="{StaticResource radBase}" Content=" 隐藏" FontSize="14" Foreground="#333333" VerticalAlignment="Top" IsChecked="True"/>
+                        <RadioButton x:Name="rbnvisi" Cursor="Hand" Style="{StaticResource radBase}" Content=" 显示" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
+                    </StackPanel>
+
+
+
+                    <TextBlock Grid.Row="3" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" HorizontalAlignment="Right"/>
+                    <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <RadioButton Cursor="Hand" x:Name="rbnRight" Style="{StaticResource radBase}" Content=" 右上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="0,0,0,0" IsChecked="True"/>
                         <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Style="{StaticResource radBase}" Content=" 右下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
                         <RadioButton Cursor="Hand" x:Name="rbnLeft" Style="{StaticResource radBase}" Content=" 左上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0" />
                         <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Style="{StaticResource radBase}" Content=" 左下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
                     </StackPanel>
-                    <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
+                    <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
                         <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
                         <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                         <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
@@ -409,28 +419,28 @@
 
 
                     <!--接口地址-->
-                    <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
-                    <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                    <TextBlock Grid.Row="4" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
+                    <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
                         <TextBlock Text="http://" FontSize="14" Padding="0,0,5,0"/>
                         <TextBox x:Name="txbInterfaceAddress" FontSize="14" Width="467" Height="30" Margin="0,-30,0,0"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
                     </StackPanel>
 
                     <!--上传地址-->
-                    <TextBlock Grid.Row="4" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
-                    <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                    <TextBlock Grid.Row="5" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
+                    <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
                         <TextBlock Text="http://" FontSize="14" Padding="0,0,5,0"/>
                         <TextBox x:Name="txbImageUploadAddress" FontSize="14" Margin="0,-30,0,0" Width="467" Height="30"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
                     </StackPanel>
 
                     <!--下载地址-->
-                    <TextBlock Grid.Row="5" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
-                    <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                    <TextBlock Grid.Row="6" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0"/>
+                    <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
                         <TextBlock Text="http://" FontSize="14" Padding="0,0,5,0"/>
                         <TextBox x:Name="txbPictureShowsAddress" FontSize="14" Margin="0,-30,0,0" Width="467" Height="30"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
                     </StackPanel>
 
-                    <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Padding="0,0,0,0" />
-                    <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Grid.Row="7" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Padding="0,0,0,0" />
+                    <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <Border Background="#CDD6E0" Width="515" Height="30" CornerRadius="3" Margin="0,-30,0,0">
                             <Label x:Name="txbStoragePath" Background="#FFFFFF" Margin="0,0,0,0" Content="D:\" FontSize="14" Foreground="#333333" Padding="10,7,2,2" Width="513" Height="28" BorderBrush="{x:Null}" BorderThickness="0"/>
                         </Border>
@@ -473,17 +483,17 @@
                             </Button.Template>
                         </Button>
                     </StackPanel>
-                    <TextBlock Grid.Row="7" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
-                    <StackPanel Grid.Row="7" Grid.Column="1">
+                    <TextBlock Grid.Row="8" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
+                    <StackPanel Grid.Row="8" Grid.Column="1">
                         <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,0,0,0"/>
                     </StackPanel>
-                    <TextBlock Grid.Row="9" Grid.Column="0" x:Name="txbVersion" Text="正式版：" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
-                    <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Grid.Row="10" Grid.Column="0" x:Name="txbVersion" Text="正式版：" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
+                    <StackPanel Grid.Row="10" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
                     </StackPanel>
 
-                    <TextBlock Grid.Row="8" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
-                    <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Grid.Row="9" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
+                    <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
                         <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
                     </StackPanel>
 

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -798,6 +798,16 @@ namespace XHWK.WKTool
                     {
                         rbnAVI.IsChecked = true;
                     }
+
+                    string isHide= FileToolsCommon.GetConfigValue("IsHideSRTool"); //工具栏是否隐藏
+                    if(isHide.Equals("1"))
+                    {
+                        rbnHide.IsChecked = true;
+                    }
+                    else
+                    {
+                        rbnvisi.IsChecked = true;
+                    }
                     string isSound = FileToolsCommon.GetConfigValue("IsSound");//<!--声音 true 有 false 无-->
                     if (isSound == "true")
                     {
@@ -908,6 +918,10 @@ namespace XHWK.WKTool
                 {
                     FileToolsCommon.SetConfigValue("IsSound", "false");
                 }
+
+
+                    UpdateHideSRToolConfig();
+
                 ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
                 if (rbnRight.IsChecked == true)
                 {
@@ -997,13 +1011,20 @@ namespace XHWK.WKTool
         /// </summary>
         void UpdateHideSRToolConfig()
         {
-            //隐藏
-            FileToolsCommon.SetConfigValue("IsHideSRTool", "1");
-            APP.IsHideSRTool = true;
+            if(rbnHide.IsChecked == true)
+            {
+                //隐藏
+                FileToolsCommon.SetConfigValue("IsHideSRTool", "1");
+                APP.IsHideSRTool = true;
+            }
+           else
+            {
+                //显示
+                FileToolsCommon.SetConfigValue("IsHideSRTool", "0");
+                APP.IsHideSRTool = false;
+            }
 
-            //显示
-            FileToolsCommon.SetConfigValue("IsHideSRTool", "0");
-            APP.IsHideSRTool = false;
+          
         }
         #endregion