清除字迹

Common/system/BlackboardNew.cs

@@ -111,6 +111,14 @@ namespace Common.system
         {
             if (step != null)
             {
+                if (pagenum + 1 > strokes_page_all.Count)
+                {
+                    ZBBPage pagetemp = new ZBBPage();
+                    pagetemp.lines.Add(new ZBBPageStep());
+                    strokes_page_all.Add(pagetemp);
+                }
+
+
                 ZBBPage page = strokes_page_all[pagenum];
                 if (page != null)
                 {

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -234,7 +234,8 @@ namespace ComeCapture
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
 
             //BitmapSource bitmap = ImageHelper.GetBitmapSource((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2, out JieTuBitmapPtr);
-           /* BitmapImage bitmap = */ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath,true,out BitmapImage bitmapimg);
+           /* BitmapImage bitmap = */
+            ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath,true,out BitmapImage bitmapimg);
             _IsMouseDown = false;
             _IsCapture = false;
             ImageEditBar.Current.Visibility = Visibility.Collapsed;
@@ -242,8 +243,8 @@ namespace ComeCapture
             SizeRGB.Visibility = Visibility.Collapsed;
             MainImage.Visibility = Visibility.Collapsed;
             DataContext = new AppModel();
-            ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);//zxy
-            Background = new ImageBrush(bitmap);
+            //ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);//zxy
+            //Background = new ImageBrush(bitmap);
             WpfHelper.MainDispatcher = Dispatcher;
             MaxWindow();
             MaskLeft.Height = ScreenHeight;

XHWK.WKTool/UploadWindow.xaml

@@ -16,9 +16,9 @@
             <!--分4行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="45"/>
-                <RowDefinition Height="80"/>
-                <RowDefinition Height="60"/>
-                <RowDefinition Height="60"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="90"/>
+                <RowDefinition Height="90"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             <!--第一行 标题-->
@@ -32,19 +32,19 @@
             <ComboBox Cursor="Hand"
                             x:Name="book_list"
                             Grid.Row="2"
-                            Height="30"
-                      Width="300"
+                            Height="50"
+                      Width="400"
                             Margin="0,0,0,0"
                             Padding="10,0,0,0"
                             VerticalContentAlignment="Center"
                             DisplayMemberPath="Value"
-                            FontSize="14"
+                            FontSize="18"
                             ItemsSource="{Binding bookList}"
                             SelectedValuePath="Key"
-                      SelectionChanged="toolbar_list_SelectionChanged"
+                      SelectionChanged="toolbar_list_SelectionChanged" BorderBrush="#FFCDD6E0" Foreground="Black" Background="White"
                           >
                 <ComboBox.Resources>
-                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="WhiteSmoke" />
+                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
                     <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" />
                 </ComboBox.Resources>
             </ComboBox>
@@ -52,16 +52,21 @@
             <ComboBox Cursor="Hand"
                             x:Name="cmbTeachingMaterial"
                             Grid.Row="3"
-                               Height="30"
-                             Width="300"
+                               Height="50"
+                             Width="400"
                             Padding="10,0,0,0"
                             VerticalContentAlignment="Center"
-                            Background="White"
+                          
                             DisplayMemberPath="Value"
-                            FontSize="14"
+                            FontSize="18"
                             Foreground="Black"
                             ItemsSource="{Binding zhangjieList}"
-                            SelectedValuePath="Key" />
+                            SelectedValuePath="Key" BorderBrush="#FFCDD6E0" >
+                <ComboBox.Resources>
+                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
+                    <!--<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Green" />-->
+                </ComboBox.Resources>
+            </ComboBox>
             <!--第四行 开始按钮-->
             <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="确定" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -289,12 +289,13 @@
                                     </Grid>
                                 </Border>
                             </Grid>
+                            <Image x:Name="imgDocumentation" Visibility="Visible"/>
+
                             <!--导入图片-->
                             <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
                             <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
                             
-                            <Image x:Name="imgDocumentation" Visibility="Visible" Width="0" Height="0" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="472,246,0,0" />
-
+                          
                             <!--摄像头-->
                             <!--<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"  />

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -42,7 +42,7 @@ namespace XHWK.WKTool
         //private CountdownWindow FileDirectoryWindows = null;  
         private FolderBrowserDialog Ofd;
         private DialogResult Result;
-        public readonly BlackboardNew myblackboard;
+        public  BlackboardNew myblackboard;
         private System.Windows.Forms.DialogResult result;
         private System.Windows.Forms.OpenFileDialog ofd;
         //声明一个 DrawingAttributes 类型的变量  
@@ -885,6 +885,8 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnScreenshot_Click(object sender, RoutedEventArgs e)
         {
+            HideAngleBorder();
+            imgCanvas.Margin = new Thickness(0, 0, 0, 0);
             APP.ImgPath = string.Empty;
             string time = GetTimeStamp();
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + time + ".jpg";
@@ -947,6 +949,7 @@ namespace XHWK.WKTool
                     }
                     if (APP.PageDrawList.Count >= APP.pageData.currpage && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
+                      
                         imgDocumentation.Source = null;
                         BitmapImage bitImg=new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
                         imgCanvas.Source = bitImg;
@@ -956,6 +959,8 @@ namespace XHWK.WKTool
                         ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
                         ImgPrintTwo.Visibility = Visibility.Collapsed;
                         btnPrint.IsEnabled = true;
+
+                   
                     }
                 }
                 this.Topmost = false;
@@ -1392,6 +1397,22 @@ namespace XHWK.WKTool
                     btnSetUp.IsEnabled = false;
 
                     btnLoginType.IsEnabled = false;
+                    blackboard_canvas.Visibility = Visibility.Visible;//zxyceshi
+
+
+                    //myblackboard = new BlackboardNew(blackboard_canvas);
+                    //DataContext = APP.pageData;
+                    //drawingAttributes = new DrawingAttributes();
+                    ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
+                    ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+                    //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+                    //blackboard_canvas.UseCustomCursor = true;
+                    //drawingAttributes.FitToCurve = true;
+                    //drawingAttributes.IgnorePressure = false;
+                    //drawingAttributes.Width = PenSize;
+                    //drawingAttributes.Height = PenSize;
+                    //drawingAttributes.Color = Color;
+                    //blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
                     #endregion
 
                     #region 录像倒计时
@@ -1587,6 +1608,21 @@ namespace XHWK.WKTool
                     APP.pageData.currpage = 0;
                     APP.pageData.pagenum = 0;
                     myblackboard.clear();
+
+                    //myblackboard = new BlackboardNew(blackboard_canvas);
+                    //DataContext = APP.pageData;
+                    //drawingAttributes = new DrawingAttributes();
+                    ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
+                    ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+                    //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+                    //blackboard_canvas.UseCustomCursor = true;
+                    //drawingAttributes.FitToCurve = true;
+                    //drawingAttributes.IgnorePressure = false;
+                    //drawingAttributes.Width = PenSize;
+                    //drawingAttributes.Height = PenSize;
+                    //drawingAttributes.Color = Color;
+                    //blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
+
                     APP.PageDrawList.Clear();
                     imgCanvas.Source = null;
                     imgDocumentation.Source = null;
@@ -1689,9 +1725,10 @@ namespace XHWK.WKTool
                 blackboard_canvas.Visibility = Visibility.Visible;
             }
             APP.pageData.pagenum += 1;
+            HideAngleBorder();
             gridPage.Visibility = Visibility.Visible;//页码大于0 显示
             APP.pageData.currpage = APP.pageData.pagenum;
-            //myblackboard.changepage(APP.pageData.currpage - 1);
+            myblackboard.changepage(APP.pageData.currpage - 1);
             ///清空页面图片UI
             imgCanvas.Source = null;
             imgDocumentation.Source = null;
@@ -3255,26 +3292,6 @@ namespace XHWK.WKTool
 
         }
         #endregion
-
-        /// <summary>
-        /// 图片失去焦点事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void imgCanvas_LostFocus(object sender, RoutedEventArgs e)
-        {
-            //HideAngleBorder();
-        }
-
-        /// <summary>
-        /// 图片获取焦点事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void imgCanvas_GotFocus(object sender, RoutedEventArgs e)
-        {
-            ShowAngleBorder();
-        }
         System.Windows.Point initialPoint;
         private void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
         {
@@ -3369,7 +3386,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                MessageWindow.Show(ex.Message);
+                MessageWindow.Show("图片过小！");
             }
         }
 
@@ -3377,27 +3394,5 @@ namespace XHWK.WKTool
         {
             ShowAngleBorder();
         }
-
-        private void gridM_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-        }
-
-        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-
-        }
-
-        private void IMG_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-        }
-
-        private void GridMain_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-        }
-
-        private void Grid_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            HideAngleBorder();
-        }
     }
 }

XHWK.WKTool/ZConfig.cs

@@ -13,9 +13,9 @@ namespace XHWK.WKTool.Config
         /// <summary>
         /// 当前版本号
         /// </summary>
-        public static int versionCode = 4;
+        public static int versionCode = 5;
 
-        public static string versionName = "1.0.3";
+        public static string versionName = "1.0.4";
 
         //接口地址
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";