Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

Models/DataModel.cs

@@ -36,5 +36,7 @@ namespace SunlightAggregationTerminal.Models
         [ObservableProperty]
         public partial bool MessageNotificationMode { get; set; }
 
+
+        public static List<Dictionary<string, object>> Info_data = new List<Dictionary<string, object>>();
     }
 }

Models/DataSource.cs

@@ -1,8 +1,10 @@
-using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
-using System.Text;
 using System.Linq;
+using System.Text;
 
 namespace SunlightAggregationTerminal.Models
 {
@@ -23,20 +25,23 @@ namespace SunlightAggregationTerminal.Models
         public DateTime Time { get; set; }
         public MsgType Type { get; set; }
     }
-    public class InfoItem
+    public partial class InfoItem : ObservableObject
     {
-        public string? Name { get; set; }
+        [ObservableProperty]
+        public string _name;
+       // public string? Name { get; set; }
         public string? State { get; set; }
+        public string? MachineName { get; set; }
         public string? Machine { get; set; }
         public string? Information { get; set; }
         public string? Model { get; set; }
         public string? Type { get; set; }
-        public string? A { get; set; }
-        public string? B { get; set; }
-        public string? C { get; set; }
-        public string? D { get; set; }
-        public string? E { get; set; }
-        public string? F { get; set; }
+        public string? ModelA { get; set; }
+        public string? ModelB { get; set; }
+        public string? ModelC { get; set; }
+        public string? ModelD { get; set; }
+        public string? ModelE { get; set; }
+        public string? ModelF { get; set; }
     }
     
     public class DyelotItem