微课发版

.editorconfig

@@ -10,7 +10,7 @@ resharper_xaml_binding_without_context_not_resolved_highlighting = none
 resharper_xaml_binding_with_context_not_resolved_highlighting = none
 
 # ReSharper properties
-resharper_csharp_max_line_length = 100
+resharper_csharp_max_line_length = 400
 resharper_csharp_wrap_arguments_style = chop_if_long
 resharper_csharp_wrap_before_binary_opsign = true
 resharper_csharp_wrap_before_declaration_lpar = true
@@ -116,4 +116,4 @@ csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_var_elsewhere = true:silent
 csharp_style_var_for_built_in_types = true:silent
-csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_when_type_is_apparent = true:silent

XHWK.WKTool/App.xaml.cs

@@ -195,7 +195,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 画板模型
         /// </summary>
-        public static List<Model_DrawData> PageDrawList = null;
+        public static List<Model_DrawData> PageDrawList = new List<Model_DrawData>();
 
         #endregion 微课数据记录
 

XHWK.WKTool/MainWindow.xaml

@@ -806,14 +806,13 @@
                                         </Grid>
                                     </ScrollViewer>
                                     <Image
-                                        x:Name="imgPlayerLeft"
+                                        x:Name="ImgPlayerLeft"
                                         Width="172"
                                         Height="124"
                                         Margin="10,7,10,10"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Top"
                                         RenderTransformOrigin="0.5,0.5"
-                                        Source="./Images/microLessonSystem_17.png"
                                         Visibility="Collapsed">
                                         <Image.RenderTransform>
                                             <ScaleTransform ScaleX="-1" />
@@ -829,35 +828,32 @@
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Top"
                                         RenderTransformOrigin="0.5,0.5"
-                                        Source="./Images/microLessonSystem_17.png"
                                         Visibility="Collapsed">
                                         <Image.RenderTransform>
                                             <ScaleTransform ScaleX="-1" />
                                         </Image.RenderTransform>
                                     </Image>
                                     <Image
-                                        x:Name="imgPlayerLeftUnder"
+                                        x:Name="ImgPlayerLeftUnder"
                                         Width="172"
                                         Height="124"
                                         Margin="10,7,10,10"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Bottom"
                                         RenderTransformOrigin="0.5,0.5"
-                                        Source="./Images/microLessonSystem_17.png"
                                         Visibility="Collapsed">
                                         <Image.RenderTransform>
                                             <ScaleTransform ScaleX="-1" />
                                         </Image.RenderTransform>
                                     </Image>
                                     <Image
-                                        x:Name="imgPlayerRightUnder"
+                                        x:Name="ImgPlayerRightUnder"
                                         Width="172"
                                         Height="124"
                                         Margin="10,7,26,10"
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Bottom"
                                         RenderTransformOrigin="0.5,0.5"
-                                        Source="./Images/microLessonSystem_17.png"
                                         Visibility="Collapsed">
                                         <Image.RenderTransform>
                                             <ScaleTransform ScaleX="-1" />
@@ -1139,7 +1135,7 @@
                                     FontSize="12"
                                     Text="摄像头: " />
                                 <RadioButton
-                                    x:Name="rbnOpen"
+                                    x:Name="RbnOpen"
                                     Margin="0,0,0,0"
                                     VerticalAlignment="Center"
                                     Click="RbnOpen_Click"
@@ -1148,7 +1144,7 @@
                                     FontSize="12"
                                     Style="{StaticResource RadBase}" />
                                 <RadioButton
-                                    x:Name="rbnTurnOff"
+                                    x:Name="RbnTurnOff"
                                     Margin="5,0,10,0"
                                     VerticalAlignment="Center"
                                     Click="RbnTurnOff_Click"
@@ -1638,7 +1634,7 @@
                                     <Grid Grid.Column="2">
                                         <!--  保存  -->
                                         <Button
-                                            x:Name="btnSave"
+                                            x:Name="BtnSave"
                                             Width="76"
                                             Height="30"
                                             HorizontalAlignment="Stretch"
@@ -1663,7 +1659,7 @@
                                             Text="设备"
                                             Visibility="Hidden" />
                                         <TextBlock
-                                            x:Name="txbNotConnecteds"
+                                            x:Name="TxbNotConnecteds"
                                             Margin="30,30,0,0"
                                             FontSize="14"
                                             Foreground="#333333"

XHWK.WKTool/MessageWindow.xaml

@@ -8,7 +8,7 @@
     Width="446"
     Height="188"
     d:DesignHeight="250"
-    AllowsTransparency="True"
+    AllowsTransparency="False"
     MouseMove="Window_MouseMove"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
@@ -16,7 +16,7 @@
     Topmost="True"
     WindowStartupLocation="CenterScreen"
     WindowState="Normal"
-    WindowStyle="None"
+    WindowStyle="SingleBorderWindow"
     mc:Ignorable="d">
 
     <Border

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -399,8 +399,7 @@ namespace XHWK.WKTool
             }
 
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
-
-            APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
+            APP.W_XHMicroLessonSystemWindow.InitTqlpPen();
             APP.W_XHMicroLessonSystemWindow.Show();
             End();
             if (t != null)
@@ -461,8 +460,7 @@ namespace XHWK.WKTool
             }
 
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
-
-            APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
+            APP.W_XHMicroLessonSystemWindow.InitTqlpPen();
             APP.W_XHMicroLessonSystemWindow.Show();
 
             if (_state == State.Pause || _state == State.Start)
@@ -878,7 +876,7 @@ namespace XHWK.WKTool
 
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
             //APP.W_XHMicroLessonSystemWindow.InitPen();
-            APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
+            APP.W_XHMicroLessonSystemWindow.InitTqlpPen();
             APP.W_XHMicroLessonSystemWindow.Show();
 
             new Thread(new ThreadStart(new Action(() =>

XHWK.WKTool/Utils/pen/TQLPen/PenEvents.cs

@@ -331,17 +331,22 @@ namespace XHWK.WKTool
                 }
                 else if (dot.type == DotType.PEN_DOWN)
                 {
-                    APP.W_XHMicroLessonSystemWindow.TQLDown();
+                    APP.W_XHMicroLessonSystemWindow.TqlDown();
                 }
                 else if (dot.type == DotType.PEN_UP)
                 {
-                    APP.W_XHMicroLessonSystemWindow.TQLUp();
+                    APP.W_XHMicroLessonSystemWindow.TqlUp();
                 }
                 else if (dot.type == DotType.PEN_MOVE)
                 {
                     double CX = (double)dot.x + (double)dot.fx / 100.00;
                     double CY = (double)dot.y + (double)dot.fy / 100.00;
-                    APP.W_XHMicroLessonSystemWindow.TQLPenWrite(CX, CY, dot.force);
+                    APP.W_XHMicroLessonSystemWindow.TqlPenWrite
+                    (
+                        CX,
+                        CY,
+                        dot.force
+                    );
                     //form.AddLog("x:" + (dot.x + dot.fx / 100f).ToString() + ", " + "y:" + (dot.y + dot.fy / 100f).ToString());
                 }
             }
@@ -364,7 +369,12 @@ namespace XHWK.WKTool
                 {
                     double CX = (double)dot.x + (double)dot.fx / 100.00;
                     double CY = (double)dot.y + (double)dot.fy / 100.00;
-                    APP.W_PracticeWindow.TqlPenWrite(CX, CY, dot.force);
+                    APP.W_PracticeWindow.TqlPenWrite
+                    (
+                        CX,
+                        CY,
+                        dot.force
+                    );
                     //form.AddLog("x:" + (dot.x + dot.fx / 100f).ToString() + ", " + "y:" + (dot.y + dot.fy / 100f).ToString());
                 }
             }
@@ -375,7 +385,6 @@ namespace XHWK.WKTool
             //    //form.AddLog("Dot_S:" + this.S.ToString() + ", " + "Dot_O:" + this.O.ToString() + ", " + "Dot_B:" + this.B.ToString() + ", " + "Dot_P:" + this.P.ToString());
             //}
 
-
             //if (dot.type == DotType.PEN_HOVER) return;
             //if (this.S != dot.sectionId || this.O != dot.ownerId || this.B != dot.noteId || this.P != dot.pageId)
             //{
@@ -386,14 +395,11 @@ namespace XHWK.WKTool
             //{
             //    //form.AddLog("x:" + (dot.x + dot.fx / 100f).ToString() + ", " + "y:" + (dot.y + dot.fy / 100f).ToString());
             //}
-
-
             ///*  if (dot.type == DotType.PEN_DOWN || dot.type == DotType.PEN_MOVE || dot.type == DotType.PEN_UP)
             //  {
             //      form.AddLog("Dot_type:" + dot.type.ToString() + ", " + "Dot_force:" + dot.force.ToString());
             //  } */
 
-
             ////if (DrawingBox.DrawType != 2) DrawingBox.DrawType = 1;
             ////form.Drawing(dot);
             //if (DrawIngend == true)

XHWK.WKTool/system/CameraHelper.cs

@@ -14,10 +14,9 @@
     {
         private static List<FilterInfo> _cameraDevices;
         private static VideoCaptureDevice _div;
-        private static VideoSourcePlayer _sourcePlayer = new VideoSourcePlayer();
+        private static readonly VideoSourcePlayer SourcePlayer = new VideoSourcePlayer();
 
         //指示_isDisplay设置为true后，是否设置了其他的sourcePlayer，若未设置则_isDisplay重设为false
-        private static bool _isSet;
 
         private static Dispatcher _dispatcher;
         public static Action<BitmapImage> imageCallback;
@@ -36,6 +35,7 @@
         /// </summary>
         public static void UpdateCameraDevices()
         {
+            // ReSharper disable once CollectionNeverUpdated.Local
             var devs = new FilterInfoCollection(FilterCategory.VideoInputDevice); //获取摄像头列表
             List<FilterInfo> allCamera = new List<FilterInfo>();
             foreach (FilterInfo dev in devs)
@@ -70,27 +70,27 @@
             // 设定初始视频设备
             _div = new VideoCaptureDevice(_cameraDevices[index].MonikerString);
             _div.NewFrame += _div_NewFrame;
-            _sourcePlayer.VideoSource = _div;
+            SourcePlayer.VideoSource = _div;
             _div.Start();
-            _sourcePlayer.Start();
+            SourcePlayer.Start();
             return true;
         }
 
         private static void _div_NewFrame(object sender, AForge.Video.NewFrameEventArgs eventArgs)
         {
-            _dispatcher.Invoke
+            _dispatcher?.Invoke
             (
                 () =>
                 {
-                    MemoryStream ms = new MemoryStream();
-                    eventArgs.Frame.Save(ms, ImageFormat.Bmp);
-                    BitmapImage image = new BitmapImage();
-                    image.BeginInit();
-                    image.StreamSource = new MemoryStream(ms.GetBuffer());
-                    ms.Close();
-                    ms.Dispose();
-                    image.EndInit();
-                    imageCallback?.Invoke(image);
+                    using (MemoryStream ms = new MemoryStream())
+                    {
+                        eventArgs.Frame.Save(ms, ImageFormat.Bmp);
+                        BitmapImage image = new BitmapImage { CacheOption = BitmapCacheOption.OnLoad };
+                        image.BeginInit();
+                        image.StreamSource = new MemoryStream(ms.GetBuffer());
+                        image.EndInit();
+                        imageCallback?.Invoke(image);
+                    }
                 }
             );
         }
@@ -103,7 +103,7 @@
         /// <returns>如果保存成功，则返回完整路径，否则为 null</returns>
         public static string CaptureImage(string filePath, string fileName = null)
         {
-            if (_sourcePlayer.VideoSource == null)
+            if (SourcePlayer.VideoSource == null)
             {
                 return null;
             }
@@ -113,7 +113,7 @@
             }
             try
             {
-                Image bitmap = _sourcePlayer.GetCurrentVideoFrame();
+                Image bitmap = SourcePlayer.GetCurrentVideoFrame();
                 if (bitmap != null)
                 {
                     if (fileName == null)
@@ -146,11 +146,17 @@
         /// </summary>
         public static void CloseDevice()
         {
-            if (_div != null && _div.IsRunning)
+            if (_div != null)
             {
                 _div.NewFrame -= _div_NewFrame;
-                _sourcePlayer.Stop();
-                _div.SignalToStop();
+                if (SourcePlayer.IsRunning)
+                {
+                    SourcePlayer.Stop();
+                }
+                if (_div.IsRunning)
+                {
+                    _div.SignalToStop();
+                }
                 _div = null;
             }
         }

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.2.7"
+#define MyAppVersion "3.9.0"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"