zhao：解决冲突

Common/system/BlackboardNew.cs

@@ -230,22 +230,28 @@ namespace Common.system
         // 清空
         public void clear()
         {
-     
-            ZBBPage page = new ZBBPage();
-            page.lines.Add(new ZBBPageStep());
-            page.lines = new List<ZBBPageStep>();
-            page.lines_histoty = new List<ZBBPageStep>();
-            strokes_page_all.Add(page);
 
+            //ZBBPage page = new ZBBPage();
+            //page.lines.Add(new ZBBPageStep());
+            //page.lines = new List<ZBBPageStep>();
+            //page.lines_histoty = new List<ZBBPageStep>();
+            //strokes_page_all.Add(page);
 
-            //ZBBPage page = strokes_page_all[pagenum];
-            //    if (page != null)
+            strokes_page_all.Clear();
+            m_canvas.Strokes.Clear();
+            //for (int i=0;i< strokes_page_all.Count;i++)
             //{
-            //    m_canvas.Strokes.Clear();
-            //    page.lines_histoty.Clear();
-            //    page.lines.Clear();
-            //    page.lines.Add(new ZBBPageStep());
+            //    ZBBPage page = strokes_page_all[pagenum];
+            //    if (page != null)
+            //    {
+            //        m_canvas.Strokes.Clear();
+            //        page.lines_histoty.Clear();
+            //        page.lines.Clear();
+            //        page.lines.Add(new ZBBPageStep());
+            //    }
             //}
+
+
         }
 
         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

@@ -103,7 +103,8 @@
                             <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
+                        <TextBlock x:Name="txbTime" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
+                        <TextBlock x:Name="txbType" Text="" FontSize="20" Foreground="#FFFFFF" Margin="20,20,0,0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
                     <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
@@ -163,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>
@@ -171,7 +172,7 @@
                                 </Border>
                             </Grid>
                             <!--导入图片-->
-                            <Image x:Name="imgDocumentation"/>
+                            <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" />
                             <!--摄像头-->
@@ -194,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"
@@ -319,12 +320,24 @@
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
                     <TextBlock Text="颜色：" FontSize="14" Padding="10,10,0,0"/>
-                    <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0"/>
-                    <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click"/>
-                    <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click"/>
-                    <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click"/>
-                    <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click"/>
-                    <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click"/>
+                    <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
+
+                    
+                        <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
+                            <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
+                        </Button>
+                        <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
+                            <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
+                        <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
+                            <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
+                        <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
+                            <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
+                        <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
+                            <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
+                        </Button>
                     <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
                     <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,10,0,0" IsChecked="True" Click="RbnFine_Click"/>
                     <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,10,0,0" Click="RbnIn_Click"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -201,6 +201,7 @@ namespace XHWK.WKTool
             }
 
             string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
+            txbTime.Text = time;
             //txbTime.Text = time;
         }
         /// <summary>
@@ -654,10 +655,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRed_Click(object sender, RoutedEventArgs e)
         {
-
             //设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.Red;
             Color = Colors.Red;
+            imgRed.Visibility = Visibility.Visible;
+            imgGray.Visibility = Visibility.Collapsed;
+            imgCyanBlue.Visibility = Visibility.Collapsed;
+            imgYellow.Visibility = Visibility.Collapsed;
+            imgBlue.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔颜色事件 黑色
@@ -668,6 +673,11 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Color = Colors.Black;
             Color = Colors.Black;
+            imgRed.Visibility = Visibility.Collapsed;
+            imgGray.Visibility = Visibility.Visible;
+            imgCyanBlue.Visibility = Visibility.Collapsed;
+            imgYellow.Visibility = Visibility.Collapsed;
+            imgBlue.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔颜色事件 青色
@@ -678,6 +688,11 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Color = Colors.LimeGreen;
             Color = Colors.LimeGreen;
+            imgRed.Visibility = Visibility.Collapsed;
+            imgGray.Visibility = Visibility.Collapsed;
+            imgCyanBlue.Visibility = Visibility.Visible;
+            imgYellow.Visibility = Visibility.Collapsed;
+            imgBlue.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔颜色事件 黄色
@@ -688,6 +703,11 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Color = Colors.Gold;
             Color = Colors.Gold;
+            imgRed.Visibility = Visibility.Collapsed;
+            imgGray.Visibility = Visibility.Collapsed;
+            imgCyanBlue.Visibility = Visibility.Collapsed;
+            imgYellow.Visibility = Visibility.Visible;
+            imgBlue.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔颜色事件 蓝色
@@ -698,6 +718,11 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Color = Colors.DeepSkyBlue;
             Color = Colors.DeepSkyBlue;
+            imgRed.Visibility = Visibility.Collapsed;
+            imgGray.Visibility = Visibility.Collapsed;
+            imgCyanBlue.Visibility = Visibility.Collapsed;
+            imgYellow.Visibility = Visibility.Collapsed;
+            imgBlue.Visibility = Visibility.Visible;
         }
         /// <summary>
         /// 画笔粗细事件 细
@@ -1063,14 +1088,17 @@ namespace XHWK.WKTool
                             {
                                 APP.pageData.currpage = APP.pageData.pagenum + 1;
                                 APP.pageData.pagenum += num;
+                                gridPage.Visibility = Visibility.Visible;//页码大于0 显示
                             }
                             if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+
                                 imgCanvas.Source = null;
                                 ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
                                 ImgScreenshotTwo.Visibility = Visibility.Visible;
                                 btnScreenshot.IsEnabled = false;
+                                imgDocumentation.Visibility = Visibility.Visible;
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                             }
                             else
                             {
@@ -1197,6 +1225,7 @@ namespace XHWK.WKTool
                         t.Start();
                     }
                     t.Interval = new TimeSpan(0, 0, 0, 1);
+                    txbTime.Visibility = Visibility.Visible;
                     Stack(); 
                     #endregion
 
@@ -1298,6 +1327,7 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Collapsed;
                 ImgStopTwo.Visibility = Visibility.Visible;
                 TxbRecordingWord.Text = "暂停";
+                Stack();
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -1340,6 +1370,7 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
                 TxbRecordingWord.Text = "继续";
+                TimeOut();
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -1441,6 +1472,7 @@ namespace XHWK.WKTool
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
+                TimeOut();
                 txbType.Text = "保存中";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
@@ -1454,6 +1486,15 @@ namespace XHWK.WKTool
                 #endregion
                 try
                 {
+                    #region 清空画板数据
+                    APP.pageData.currpage = 0;
+                    APP.pageData.pagenum = 0;
+                    myblackboard.clear();
+                    APP.PageDrawList.Clear();
+                    imgCanvas.Source = null;
+                    imgDocumentation.Source = null;
+                    #endregion
+
                     //缩略图
                     string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
                     FileToolsCommon.CreateDirectory(ThumbnailPath);
@@ -1503,6 +1544,9 @@ namespace XHWK.WKTool
                             BtnRecord.IsEnabled = true;
                             btnStop.IsEnabled = true;
                             TxbRecordingWord.Text = "录制";
+                            End();
+                            txbTime.Text = "";
+                            txbTime.Visibility = Visibility.Hidden;
                             txbType.Text = "";
                         });
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
@@ -1549,7 +1593,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;
@@ -1557,7 +1601,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/XHWK.WKTool.csproj

@@ -1538,6 +1538,7 @@
     <Resource Include="Images\countdown3_7.png" />
     <Resource Include="Images\countdown3_8.png" />
     <Resource Include="Images\countdown3_9.png" />
+    <Resource Include="Images\microLessonSystem_999.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

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";