录制结束清除 屏幕 笔迹图片。 工具栏未完成

Common/system/BlackboardNew.cs

@@ -238,6 +238,7 @@ namespace Common.system
             //strokes_page_all.Add(page);
 
             strokes_page_all.Clear();
+            m_canvas.Strokes.Clear();
             //for (int i=0;i< strokes_page_all.Count;i++)
             //{
             //    ZBBPage page = strokes_page_all[pagenum];
@@ -250,7 +251,7 @@ namespace Common.system
             //    }
             //}
 
-          
+
         }
 
         public void changepage(int mpagenum)

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -73,16 +73,25 @@
             </Grid>
 
             <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
-            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="23" Foreground="#FFFFFF" Margin="30,50,0,0"/>
+            <Button Grid.Row="1" x:Name="BtnRecordingScreen" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="46,0,15,0" Click="BtnRecordingScreen_Click">
+                <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
+            </Button>
+            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Margin="39,80,0,0" Visibility="Hidden"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
-                <Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
+                <!--<Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
                     <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
-                </Button>
-                <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnStopRecordingScreen_Click">
+                </Button>-->
+                <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnStopRecordingScreen_Click">
                     <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar14.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar8.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
+                    <Image Source="./Images/Toobar27.png"/>
+                </Button>
+                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
+                    <Image Source="./Images/Toobar28.png"/>
+                </Button>
+                <Button  Cursor="Hand" x:Name="btnBlackPen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
+                    <Image Source="./Images/Toobar29.png"/>
                 </Button>
             </StackPanel>
         </Grid>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -87,7 +87,7 @@ namespace XHWK.WKTool
             gridToolbar.Visibility = Visibility.Hidden;
             gridColour.Visibility = Visibility.Hidden;
             gridThickness.Visibility = Visibility.Hidden;
-            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));
             if (t == null)
             {
                 t = new DispatcherTimer();
@@ -228,6 +228,7 @@ namespace XHWK.WKTool
                 //#endregion
 
                 ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
+                txbTime.Visibility = Visibility.Visible;
                 try
                 {
                     new Thread(new ThreadStart(new Action(() =>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -164,7 +164,7 @@
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown">
+                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" Visibility="Collapsed">
                                                 </Image>
                                             </ContentControl>
                                         </ScrollViewer>
@@ -172,7 +172,7 @@
                                 </Border>
                             </Grid>
                             <!--导入图片-->
-                            <Image x:Name="imgDocumentation" Source="./Images/microLessonSystem_18.png"/>
+                            <Image x:Name="imgDocumentation" Visibility="Collapsed"/>
                             <!--<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" />
                             <!--摄像头-->
@@ -195,8 +195,8 @@
                     <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
                 </Grid>
                 <!--页码-->
-                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" Background="#FFFFFF">
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Center"
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
             Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1490,6 +1490,8 @@ namespace XHWK.WKTool
                     APP.pageData.pagenum = 0;
                     myblackboard.clear();
                     APP.PageDrawList.Clear();
+                    imgCanvas.Source = null;
+                    imgDocumentation.Source = null;
                     #endregion
 
                     //缩略图
@@ -1590,7 +1592,7 @@ namespace XHWK.WKTool
             APP.pageData.pagenum += 1;
             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;
@@ -1598,7 +1600,7 @@ namespace XHWK.WKTool
             Model_DrawData model_DrawData = new Model_DrawData();
             model_DrawData.PageNum = APP.pageData.currpage;
             APP.PageDrawList.Add(model_DrawData);
-            APP.SaveDraw();
+            //APP.SaveDraw();
             if (btnImport.IsEnabled == true)
             {
                 ///截图可用

XHWK.WKTool/ZConfig.cs

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