20260306001 无逻辑变动，仅同步

MvvmScaffoldFrame48.MODEL/MvvmScaffoldFrame48.Model.csproj

@@ -74,7 +74,7 @@
     <Compile Include="StorageModel\ProcessingConfig\ProcessingAlgorithmConfigModel.cs" />
     <Compile Include="StorageModel\SystemAlarm\AlarmMessModel.cs" />
     <Compile Include="StorageModel\SystemAlarm\AlarmTypes.cs" />
-    <Compile Include="StorageModel\SystemConfig\AllCameraProcessConfigModel.cs" />
+    <Compile Include="StorageModel\SystemConfig\CameraProcessConfigModel.cs" />
     <Compile Include="StorageModel\SystemTools\SystemMessageConfigModel.cs" />
     <Compile Include="UserModel.cs" />
   </ItemGroup>

MvvmScaffoldFrame48.MODEL/StorageModel/SystemConfig/AllCameraProcessConfigModel.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace MvvmScaffoldFrame48.Model.StorageModel.SystemConfig
-{
-    // <summary>
-    /// 单个相机处理配置
-    /// </summary>
-    public class CameraProcessConfigModel
-    {
-        /// <summary>
-        /// 相机ID
-        /// </summary>
-        public int CameraId { get; set; }
-
-        /// <summary>
-        /// 相机序列号
-        /// </summary>
-        public string CameraSN { get; set; }
-
-        /// <summary>
-        /// 使用的图像处理算法名称
-        /// </summary>
-        public string ProcessingAlgorithmName { get; set; }
-
-        /// <summary>
-        /// 算法参数
-        /// </summary>
-        //public Dictionary<string, object> AlgorithmParameters { get; set; }
-        public string AlgorithmParameters { get; set; }
-
-        /// <summary>
-        /// 相机参数
-        /// </summary>
-        //public Dictionary<string, object> CameraParameters { get; set; }
-        public string CameraParameters { get; set; }
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        public bool IsEnabled { get; set; }
-
-        //public CameraProcessConfigModel()
-        //{
-            //AlgorithmParameters = new Dictionary<string, object>();
-            //CameraParameters = new Dictionary<string, object>();
-        //}
-    }
-}

MvvmScaffoldFrame48.MODEL/StorageModel/SystemConfig/CameraProcessConfigModel.cs

@@ -30,14 +30,12 @@ namespace MvvmScaffoldFrame48.Model.StorageModel.SystemConfig
         /// <summary>
         /// 算法参数
         /// </summary>
-        //public Dictionary<string, object> AlgorithmParameters { get; set; }
-        public string AlgorithmParameters { get; set; } = "{}";
+        public string AlgorithmParameters { get; set; }
 
         /// <summary>
         /// 相机参数
         /// </summary>
-        //public Dictionary<string, object> CameraParameters { get; set; }
-        public string CameraParameters { get; set; } = "{}";
+        public string CameraParameters { get; set; }
 
         /// <summary>
         /// 是否启用