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

ViewModel/MainWindowViewModel.cs

@@ -83,7 +83,7 @@ namespace DyeingComputer.ViewModel
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每0.5秒调用一次Tick
             {
-                Interval = TimeSpan.FromSeconds(0.5)//秒
+                Interval = TimeSpan.FromSeconds(1)//秒
             };
             timer1s.Tick += Tick_Event_1S;
             timer1s.Start();
@@ -130,7 +130,6 @@ namespace DyeingComputer.ViewModel
 
         }
 
-
         void IO_data()//刷新
         {
             updata_dtm("1", lk);
@@ -209,13 +208,15 @@ namespace DyeingComputer.ViewModel
         {
             public string IOName { get; set; }
             public int AIO { get; set; }
-            public String ID { get; set; }
+            public string ID { get; set; }
+            public string type { get; set; }
         }
         public class DATA_D
         {
             public string IOName { get; set; }
             public bool DIO { get; set; }
-            public String ID { get; set; }
+            public string ID { get; set; }
+            public string type {  get; set; }
         }
         public class DATA_M
         {