20260314002 删除一些已经废弃的代码

MvvmScaffoldFrame48.DLL/ThreadManager/CameraGroup.cs

@@ -22,22 +22,14 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
     public class CameraGroup
     {
         #region 变量与实例
-        //相机线程的休眠时间，默认为0，即不休眠。在采集节拍没有那么高时，增加此值降低性能消耗
-        private int CameraSleepTime = 0;
-        //帧编号记录
-        private long lastframeNum = -1;
         //相机
         public HikCamera Camera { get; set; }
         //相机ID
         public int CameraId { get; set; }
         //是否运行中
         public bool IsRunning { get; set; }
-        //相机处理线程
-        public Task CameraTask { get; set; }
         //图像处理线程
         public Task ProcessingTask { get; set; }
-        //图像队列-ConcurrentQueue
-        public ConcurrentQueue<IFrameOut> ImageQueue { get; set; }
         //图像队列-自定义RingBuffer
         public LockFreeRingBuffer<IFrameOut> ImageRingBuffer = new LockFreeRingBuffer<IFrameOut>(30);
         //信号量
@@ -114,9 +106,6 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
             // 等待线程完成
             try
             {
-                if (CameraTask != null)
-                    await CameraTask;
-
                 if (ProcessingTask != null)
                     await ProcessingTask;
             }

MvvmScaffoldFrame48.DLL/ThreadManager/ThreadManager.cs

@@ -61,7 +61,6 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
                     _cameraGroups[i] = new CameraGroup
                     {
                         CameraId = i,
-                        ImageQueue = new ConcurrentQueue<IFrameOut>(),
                         QueueSemaphore = new SemaphoreSlim(0),
                         Camera = new HikCamera(),
                         Configuration = cameraConfig
@@ -72,7 +71,6 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
                     _cameraGroups[i] = new CameraGroup
                     {
                         CameraId = i,
-                        ImageQueue = new ConcurrentQueue<IFrameOut>(),
                         QueueSemaphore = new SemaphoreSlim(0),
                         Camera = new HikCamera(cameraInfo),
                         Configuration = cameraConfig

MvvmScaffoldFrame48/WPFPage/CustomControlPage.xaml

@@ -132,7 +132,7 @@
             </StackPanel>
             <StackPanel Orientation ="Horizontal"  HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,160,0,0">
                 <Label Content="按钮状态切换："/>
-                <Button Content="双按钮切换" Name="DouBleSwitchBtn" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" Height="30" Command="{Binding SwitchCommand}">
+                <Button Content="双按钮切换" Name="DouBleSwitchBtn" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" Height="30" Command="{Binding DoubleSwitchCommand}">
                     <Button.Style>
                         <Style TargetType="Button">
                             <Setter Property="Background" Value="Blue"/>
@@ -144,7 +144,7 @@
                         </Style>
                     </Button.Style>
                 </Button>
-                <Button Content="按钮切换" Name="SwitchBtn" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" Height="30" Command="{Binding DoubleSwitchCommand}">
+                <Button Content="按钮切换" Name="SwitchBtn" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" Height="30" Command="{Binding SwitchCommand}">
                     <Button.Style>
                         <Style TargetType="Button">
                             <Setter Property="Background" Value="Blue"/>