change - 修改数据库 json识别

HighWayIot.Repository/HighWayIot.Repository.csproj

@@ -39,8 +39,8 @@
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>..\HighWayIot.Library\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="SqlSugar, Version=5.1.4.130, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SqlSugar.5.1.4.130\lib\SqlSugar.dll</HintPath>
+    <Reference Include="SqlSugar, Version=5.1.4.131, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SqlSugar.5.1.4.131\lib\SqlSugar.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

HighWayIot.Repository/domain/RFIDContent.cs

@@ -11,6 +11,9 @@ namespace HighWayIot.Repository.domain
         [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
         public int ID { get; set; }
 
+        [SugarColumn(ColumnName = "ip")]
+        public string IP { get; set; }
+
         [SugarColumn(ColumnName = "sn")]
         public int SN { get; set; }
 

HighWayIot.Repository/domain/RFIDHeartbeat.cs

@@ -11,15 +11,12 @@ namespace HighWayIot.Repository.domain
         [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
         public int ID { get; set; }
 
-        [SugarColumn(ColumnName = "deviceno")]
-        public int DeviceNo { get; set; }
+        [SugarColumn(ColumnName = "ip")]
+        public string IP { get; set; }
 
         [SugarColumn(ColumnName = "beattime")]
         public DateTime BeatTime { get; set; }
 
-        [SugarColumn(ColumnName = "timespan")]
-        public string TimeSpan { get; set; }
-
     }
 
 }

HighWayIot.Repository/domain/RFIDState.cs

@@ -11,11 +11,11 @@ namespace HighWayIot.Repository.domain
         [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
         public int ID { get; set; }
 
-        [SugarColumn(ColumnName = "deviceno")]
-        public int DeviceNo { get; set; }
+        [SugarColumn(ColumnName = "ip")]
+        public string IP { get; set; }
 
-        [SugarColumn(ColumnName = "devicestate")]
-        public bool DeviceState { get; set; }
+        [SugarColumn(ColumnName = "status")]
+        public bool Status { get; set; }
 
         [SugarColumn(ColumnName = "logtime")]
         public DateTime LogTime { get; set; }

HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8f08adb8c24b343384958ba9007d2dc0610ea042
+55a5f53c4b5b0fce2f3ad5f1ab48f0b8166cf4f9

HighWayIot.Repository/packages.config

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="SqlSugar" version="5.1.4.130" targetFramework="net48" />
-</packages>
+<packages />

HighWayIot.Repository/service/IHeartbeatService.cs

@@ -27,7 +27,7 @@ namespace HighWayIot.Repository.service
         /// </summary>
         /// <param name="deviceno"></param>
         /// <returns>影响的行数</returns>
-        int UpdateHeartbeatInfo(int deviceno);
+        int UpdateHeartbeatInfo(string ip);
 
     }
 }

HighWayIot.Repository/service/Impl/BaseHeartbeatServiceImpl.cs

@@ -39,11 +39,11 @@ namespace HighWayIot.Repository.service.Impl
             }
         }
 
-        public int UpdateHeartbeatInfo(int deviceno)
+        public int UpdateHeartbeatInfo(string ip)
         {
             try
             {
-                return _repository.AsUpdateable().SetColumns(x => x.BeatTime == DateTime.Now).Where(x => x.DeviceNo == deviceno).ExecuteCommand();
+                return _repository.AsUpdateable().SetColumns(x => x.BeatTime == DateTime.Now).Where(x => x.IP == ip).ExecuteCommand();
             }
             catch(Exception ex)
             {

HighWayIot.TouchSocket/BufferAnalysis.cs

@@ -1,11 +1,13 @@
 using HighWayIot.Log4net;
 using HighWayIot.Repository.domain;
 using HighWayIot.Repository.service.Impl;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.Windows.Forms.AxHost;
 
 namespace HighWayIot.TouchSocket
 {
@@ -13,7 +15,56 @@ namespace HighWayIot.TouchSocket
     {
         private static LogHelper logHelper = LogHelper.Instance;
 
-        
+        /// <summary>
+        /// 心跳报文分析
+        /// </summary>
+        /// <param name="bytes"></param>
+        public static void HeartbeatSocket(JObject obj, string ip)
+        {
+            BaseHeartbeatServiceImpl sql = new BaseHeartbeatServiceImpl();
+
+            if (sql.UpdateHeartbeatInfo(ip) == 0)
+            {
+                RFIDHeartbeat heartbeat = new RFIDHeartbeat()
+                {
+                    IP = ip,
+                    BeatTime = DateTime.Now,
+                };
+                sql.AddHeartbeatInfo(heartbeat);
+            }
+        }
+
+        /// <summary>
+        /// RFID发送设备状态
+        /// </summary>
+        /// <param name="bytes"></param>
+        public static void RFIDStatusSocket(JObject obj, string ip)
+        {
+            BaseStateServiceImpl sql = new BaseStateServiceImpl();
+            RFIDState rFIDState = new RFIDState()
+            {
+                IP = ip,
+                DeviceState = state == 1 ? true : false,
+                LogTime = DateTime.Now,
+            };
+            sql.AddStateInfo(rFIDState);
+        }
+
+        /// <summary>
+        /// RFID发送条码
+        /// </summary>
+        /// <param name="bytes"></param>
+        public static void RFIDCodeSocket(JObject obj, string ip)
+        {
+            if ()
+            {
+                BaseContentServiceImpl sql = new BaseContentServiceImpl();
+            }
+            else
+            {
+                logHelper.Error("条码发送报文编号数值转换出现错误！");
+            }
+        }
 
         /// <summary>
         /// 将一个数组拆成另外一个数组

HighWayIot.TouchSocket/TcpServer.cs

@@ -1,4 +1,6 @@
 using HighWayIot.Log4net;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -55,7 +57,7 @@ namespace HighWayIot.TouchSocket
                     //var mes = Encoding.ASCII.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len
                     //logHelper.Info($"已从{client.IP}:{client.Port}接收到信息：{mes}");
 
-                    BufferMemory(BufferAnalysis.SplitByteArray(e.ByteBlock.Buffer, 0, e.ByteBlock.Len));
+                    BufferMemory(Encoding.ASCII.GetString(BufferAnalysis.SplitByteArray(e.ByteBlock.Buffer, 0, e.ByteBlock.Len)), client.IP);
 
                     return EasyTask.CompletedTask;
                 };
@@ -121,9 +123,33 @@ namespace HighWayIot.TouchSocket
             }
         }
 
-        private void BufferMemory(byte[] bytes)
+        private void BufferMemory(string json, string ip)
         {
-            
+            JObject obj = JsonConvert.DeserializeObject<JObject>(json);
+            if (obj["status"] != null)
+            {
+                string str = obj["status"].Value<string>();
+                if (str == "HEART")
+                {
+                    BufferAnalysis.HeartbeatSocket(obj, ip);
+                }
+                else if (str == "WARNNING")
+                {
+                    BufferAnalysis.RFIDStatusSocket(obj, ip);
+                }
+                else if (str == "GR" && str == "NR")
+                {
+                    BufferAnalysis.RFIDCodeSocket(obj, ip);
+                }
+                else
+                {
+                    logHelper.Info($"{str}为未知类型！");
+                }
+            }
+            else
+            {
+                logHelper.Info($"输入格式错误！");
+            }
         }
 
     }

RFIDSocket/App.config

@@ -17,6 +17,10 @@
         <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.122.21.1" newVersion="4.122.21.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

RFIDSocket/DataAnalysis.cs

@@ -24,42 +24,42 @@ namespace RFIDSocket
 
         public void GetData()
         {
-            BaseContentServiceImpl baseContentServiceImpl = new BaseContentServiceImpl();
-            BaseHeartbeatServiceImpl baseHeartbeatServiceImpl = new BaseHeartbeatServiceImpl();
-            BaseStateServiceImpl baseStateServiceImpl = new BaseStateServiceImpl();
+            //BaseContentServiceImpl baseContentServiceImpl = new BaseContentServiceImpl();
+            //BaseHeartbeatServiceImpl baseHeartbeatServiceImpl = new BaseHeartbeatServiceImpl();
+            //BaseStateServiceImpl baseStateServiceImpl = new BaseStateServiceImpl();
 
-            rFIDContents = baseContentServiceImpl.GetContentInfos().Reverse<RFIDContent>().Take(200).ToList();
+            //rFIDContents = baseContentServiceImpl.GetContentInfos().Reverse<RFIDContent>().Take(200).ToList();
 
-            rFIDStates = baseStateServiceImpl.GetStateInfos();
+            //rFIDStates = baseStateServiceImpl.GetStateInfos();
 
-            var StateGroup = rFIDStates.GroupBy(x => x.DeviceNo);
+            //var StateGroup = rFIDStates.GroupBy(x => x.DeviceNo);
 
-            AlarmState.Clear();
+            //AlarmState.Clear();
 
-            foreach(var a in StateGroup)
-            {
-                var b = a.LastOrDefault();
-                if (b.DeviceState)
-                {
-                    AlarmState.Add(b);
-                }
-            }
+            //foreach(var a in StateGroup)
+            //{
+            //    var b = a.LastOrDefault();
+            //    if (b.DeviceState)
+            //    {
+            //        AlarmState.Add(b);
+            //    }
+            //}
 
-            rFIDHeartbeats = baseHeartbeatServiceImpl.GetHeartbeatInfos();
+            //rFIDHeartbeats = baseHeartbeatServiceImpl.GetHeartbeatInfos();
 
-            var HeartBeatGroup = rFIDHeartbeats.GroupBy(x => x.DeviceNo);
+            //var HeartBeatGroup = rFIDHeartbeats.GroupBy(x => x.DeviceNo);
 
-            HeartbeatsState.Clear();
+            //HeartbeatsState.Clear();
 
-            foreach (var a in HeartBeatGroup)
-            {
-                var b = a.LastOrDefault();
-                if (DateTime.Now - b.BeatTime > TimeSpan.FromSeconds(10))
-                {
-                    b.TimeSpan = SecondToTime(Convert.ToInt32((DateTime.Now - b.BeatTime).TotalSeconds));
-                    HeartbeatsState.Add(b);
-                }
-            }
+            //foreach (var a in HeartBeatGroup)
+            //{
+            //    var b = a.LastOrDefault();
+            //    if (DateTime.Now - b.BeatTime > TimeSpan.FromSeconds(10))
+            //    {
+            //        b.TimeSpan = SecondToTime(Convert.ToInt32((DateTime.Now - b.BeatTime).TotalSeconds));
+            //        HeartbeatsState.Add(b);
+            //    }
+            //}
         }
 
         private string SecondToTime(int t)

RFIDSocket/LogControl.cs

@@ -10,24 +10,24 @@ namespace RFIDSocket
 {
     public class LogControl
     {
-        public static List<RFIDContent> LogContentSelect(List<RFIDContent> lists, string content)
-        {
-            return lists.Where(x => x.Content.Contains(content)).ToList();
-        }
+        //public static List<RFIDContent> LogContentSelect(List<RFIDContent> lists, string content)
+        //{
+        //    return lists.Where(x => x.Content.Contains(content)).ToList();
+        //}
 
-        public static List<RFIDContent> LogReadKindSelect(List<RFIDContent> lists, string readKind)
-        {
-            return lists.Where(x => x.ReadKind == readKind).ToList();
-        }
+        //public static List<RFIDContent> LogReadKindSelect(List<RFIDContent> lists, string readKind)
+        //{
+        //    return lists.Where(x => x.ReadKind == readKind).ToList();
+        //}
 
-        public static List<RFIDContent> LogDeviceNoSelect(List<RFIDContent> lists, int deviceNo)
-        {
-            return lists.Where(x => x.DeviceNo == deviceNo).ToList();
-        }
+        //public static List<RFIDContent> LogDeviceNoSelect(List<RFIDContent> lists, int deviceNo)
+        //{
+        //    return lists.Where(x => x.DeviceNo == deviceNo).ToList();
+        //}
 
-        public static List<RFIDContent> LogTimeSelect(List<RFIDContent> lists, DateTime start, DateTime end)
-        {
-            return lists.Where(x => x.LogTime >= start && x.LogTime <= end).ToList();
-        }
+        //public static List<RFIDContent> LogTimeSelect(List<RFIDContent> lists, DateTime start, DateTime end)
+        //{
+        //    return lists.Where(x => x.LogTime >= start && x.LogTime <= end).ToList();
+        //}
     }
 }

RFIDSocket/Properties/Resources.Designer.cs

@@ -1,71 +1,133 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 4.0.30319.42000
+//     运行时版本:4.0.30319.42000
 //
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，则所做更改将丢失。
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RFIDSocket.Properties
-{
-
-
+namespace RFIDSocket.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   强类型资源类，用于查找本地化字符串等。
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
     // 此类是由 StronglyTypedResourceBuilder
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   返回此类使用的缓存 ResourceManager 实例。
+        ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RFIDSocket.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   重写当前线程的 CurrentUICulture 属性，对
         ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ConnectNormal {
+            get {
+                object obj = ResourceManager.GetObject("ConnectNormal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ConnectWarning {
+            get {
+                object obj = ResourceManager.GetObject("ConnectWarning", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap NormalCount {
+            get {
+                object obj = ResourceManager.GetObject("NormalCount", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap RunNormal {
+            get {
+                object obj = ResourceManager.GetObject("RunNormal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap RunWarning {
+            get {
+                object obj = ResourceManager.GetObject("RunWarning", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap TotalCount {
+            get {
+                object obj = ResourceManager.GetObject("TotalCount", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap WarningCount {
+            get {
+                object obj = ResourceManager.GetObject("WarningCount", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

RFIDSocket/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,31 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ConnectNormal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\ConnectNormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ConnectWarning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\ConnectWarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RunNormal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\RunNormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NormalCount" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\NormalCount.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RunWarning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\RunWarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TotalCount" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\TotalCount.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WarningCount" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\WarningCount.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

RFIDSocket/RFIDLog.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             this.TimeSelect = new System.Windows.Forms.Button();
             this.StartTime = new System.Windows.Forms.DateTimePicker();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -40,11 +39,6 @@
             this.DeviceNo = new System.Windows.Forms.TextBox();
             this.DeviceNoSelect = new System.Windows.Forms.Button();
             this.LogContent = new System.Windows.Forms.DataGridView();
-            this.deviceNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.readKindDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.contentDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.Content = new System.Windows.Forms.TextBox();
             this.ContentSelect = new System.Windows.Forms.Button();
@@ -53,15 +47,15 @@
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LogContent)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit();
             this.groupBox4.SuspendLayout();
             this.SuspendLayout();
             // 
             // TimeSelect
             // 
-            this.TimeSelect.Location = new System.Drawing.Point(42, 76);
+            this.TimeSelect.Location = new System.Drawing.Point(56, 95);
+            this.TimeSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.TimeSelect.Name = "TimeSelect";
-            this.TimeSelect.Size = new System.Drawing.Size(122, 48);
+            this.TimeSelect.Size = new System.Drawing.Size(163, 60);
             this.TimeSelect.TabIndex = 0;
             this.TimeSelect.Text = "时间范围查询";
             this.TimeSelect.UseVisualStyleBackColor = true;
@@ -71,9 +65,10 @@
             // 
             this.StartTime.CustomFormat = "yyyy-MM-dd hh:mm:ss";
             this.StartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.StartTime.Location = new System.Drawing.Point(25, 20);
+            this.StartTime.Location = new System.Drawing.Point(33, 25);
+            this.StartTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StartTime.Name = "StartTime";
-            this.StartTime.Size = new System.Drawing.Size(158, 21);
+            this.StartTime.Size = new System.Drawing.Size(209, 25);
             this.StartTime.TabIndex = 1;
             // 
             // groupBox1
@@ -81,9 +76,11 @@
             this.groupBox1.Controls.Add(this.EndTime);
             this.groupBox1.Controls.Add(this.StartTime);
             this.groupBox1.Controls.Add(this.TimeSelect);
-            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Location = new System.Drawing.Point(16, 15);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(208, 131);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox1.Size = new System.Drawing.Size(277, 164);
             this.groupBox1.TabIndex = 2;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "按日期时间查询";
@@ -92,18 +89,21 @@
             // 
             this.EndTime.CustomFormat = "yyyy-MM-dd hh:mm:ss";
             this.EndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.EndTime.Location = new System.Drawing.Point(25, 49);
+            this.EndTime.Location = new System.Drawing.Point(33, 61);
+            this.EndTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.EndTime.Name = "EndTime";
-            this.EndTime.Size = new System.Drawing.Size(158, 21);
+            this.EndTime.Size = new System.Drawing.Size(209, 25);
             this.EndTime.TabIndex = 2;
             // 
             // groupBox2
             // 
             this.groupBox2.Controls.Add(this.ReadKind);
             this.groupBox2.Controls.Add(this.ReadKindSelect);
-            this.groupBox2.Location = new System.Drawing.Point(12, 149);
+            this.groupBox2.Location = new System.Drawing.Point(16, 186);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(208, 131);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox2.Size = new System.Drawing.Size(277, 164);
             this.groupBox2.TabIndex = 5;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "读码结果查询";
@@ -111,17 +111,19 @@
             // ReadKind
             // 
             this.ReadKind.FormattingEnabled = true;
-            this.ReadKind.Location = new System.Drawing.Point(42, 30);
+            this.ReadKind.Location = new System.Drawing.Point(56, 38);
+            this.ReadKind.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReadKind.Name = "ReadKind";
-            this.ReadKind.Size = new System.Drawing.Size(122, 20);
+            this.ReadKind.Size = new System.Drawing.Size(161, 23);
             this.ReadKind.TabIndex = 1;
             this.ReadKind.Text = " ";
             // 
             // ReadKindSelect
             // 
-            this.ReadKindSelect.Location = new System.Drawing.Point(42, 65);
+            this.ReadKindSelect.Location = new System.Drawing.Point(56, 81);
+            this.ReadKindSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReadKindSelect.Name = "ReadKindSelect";
-            this.ReadKindSelect.Size = new System.Drawing.Size(122, 48);
+            this.ReadKindSelect.Size = new System.Drawing.Size(163, 60);
             this.ReadKindSelect.TabIndex = 0;
             this.ReadKindSelect.Text = "读码结果查询";
             this.ReadKindSelect.UseVisualStyleBackColor = true;
@@ -131,25 +133,29 @@
             // 
             this.groupBox3.Controls.Add(this.DeviceNo);
             this.groupBox3.Controls.Add(this.DeviceNoSelect);
-            this.groupBox3.Location = new System.Drawing.Point(12, 286);
+            this.groupBox3.Location = new System.Drawing.Point(16, 358);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(208, 131);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox3.Size = new System.Drawing.Size(277, 164);
             this.groupBox3.TabIndex = 6;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "设备编号查询";
             // 
             // DeviceNo
             // 
-            this.DeviceNo.Location = new System.Drawing.Point(42, 29);
+            this.DeviceNo.Location = new System.Drawing.Point(56, 36);
+            this.DeviceNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.DeviceNo.Name = "DeviceNo";
-            this.DeviceNo.Size = new System.Drawing.Size(122, 21);
+            this.DeviceNo.Size = new System.Drawing.Size(161, 25);
             this.DeviceNo.TabIndex = 1;
             // 
             // DeviceNoSelect
             // 
-            this.DeviceNoSelect.Location = new System.Drawing.Point(42, 65);
+            this.DeviceNoSelect.Location = new System.Drawing.Point(56, 81);
+            this.DeviceNoSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.DeviceNoSelect.Name = "DeviceNoSelect";
-            this.DeviceNoSelect.Size = new System.Drawing.Size(122, 48);
+            this.DeviceNoSelect.Size = new System.Drawing.Size(163, 60);
             this.DeviceNoSelect.TabIndex = 0;
             this.DeviceNoSelect.Text = "设备编号查询";
             this.DeviceNoSelect.UseVisualStyleBackColor = true;
@@ -157,76 +163,43 @@
             // 
             // LogContent
             // 
-            this.LogContent.AutoGenerateColumns = false;
             this.LogContent.ColumnHeadersHeight = 20;
-            this.LogContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.deviceNoDataGridViewTextBoxColumn,
-            this.readKindDataGridViewTextBoxColumn,
-            this.contentDataGridViewTextBoxColumn,
-            this.logTimeDataGridViewTextBoxColumn});
-            this.LogContent.DataSource = this.rFIDContentBindingSource;
-            this.LogContent.Location = new System.Drawing.Point(226, 12);
+            this.LogContent.Location = new System.Drawing.Point(301, 15);
+            this.LogContent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.LogContent.Name = "LogContent";
             this.LogContent.RowHeadersVisible = false;
+            this.LogContent.RowHeadersWidth = 51;
             this.LogContent.RowTemplate.Height = 18;
-            this.LogContent.Size = new System.Drawing.Size(500, 899);
+            this.LogContent.Size = new System.Drawing.Size(667, 1124);
             this.LogContent.TabIndex = 7;
             // 
-            // deviceNoDataGridViewTextBoxColumn
-            // 
-            this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo";
-            this.deviceNoDataGridViewTextBoxColumn.HeaderText = "编号";
-            this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn";
-            this.deviceNoDataGridViewTextBoxColumn.Width = 40;
-            // 
-            // readKindDataGridViewTextBoxColumn
-            // 
-            this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind";
-            this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果";
-            this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn";
-            this.readKindDataGridViewTextBoxColumn.Width = 60;
-            // 
-            // contentDataGridViewTextBoxColumn
-            // 
-            this.contentDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.contentDataGridViewTextBoxColumn.DataPropertyName = "Content";
-            this.contentDataGridViewTextBoxColumn.HeaderText = "条码内容";
-            this.contentDataGridViewTextBoxColumn.Name = "contentDataGridViewTextBoxColumn";
-            // 
-            // logTimeDataGridViewTextBoxColumn
-            // 
-            this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime";
-            this.logTimeDataGridViewTextBoxColumn.HeaderText = "日志时间";
-            this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn";
-            this.logTimeDataGridViewTextBoxColumn.Width = 105;
-            // 
-            // rFIDContentBindingSource
-            // 
-            this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent);
-            // 
             // groupBox4
             // 
             this.groupBox4.Controls.Add(this.Content);
             this.groupBox4.Controls.Add(this.ContentSelect);
-            this.groupBox4.Location = new System.Drawing.Point(12, 423);
+            this.groupBox4.Location = new System.Drawing.Point(16, 529);
+            this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(208, 131);
+            this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox4.Size = new System.Drawing.Size(277, 164);
             this.groupBox4.TabIndex = 7;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "条码内容查询";
             // 
             // Content
             // 
-            this.Content.Location = new System.Drawing.Point(42, 29);
+            this.Content.Location = new System.Drawing.Point(56, 36);
+            this.Content.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Content.Name = "Content";
-            this.Content.Size = new System.Drawing.Size(122, 21);
+            this.Content.Size = new System.Drawing.Size(161, 25);
             this.Content.TabIndex = 1;
             // 
             // ContentSelect
             // 
-            this.ContentSelect.Location = new System.Drawing.Point(42, 65);
+            this.ContentSelect.Location = new System.Drawing.Point(56, 81);
+            this.ContentSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ContentSelect.Name = "ContentSelect";
-            this.ContentSelect.Size = new System.Drawing.Size(122, 48);
+            this.ContentSelect.Size = new System.Drawing.Size(163, 60);
             this.ContentSelect.TabIndex = 0;
             this.ContentSelect.Text = "条码内容查询";
             this.ContentSelect.UseVisualStyleBackColor = true;
@@ -234,9 +207,10 @@
             // 
             // SelectAll
             // 
-            this.SelectAll.Location = new System.Drawing.Point(12, 560);
+            this.SelectAll.Location = new System.Drawing.Point(16, 700);
+            this.SelectAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SelectAll.Name = "SelectAll";
-            this.SelectAll.Size = new System.Drawing.Size(208, 48);
+            this.SelectAll.Size = new System.Drawing.Size(277, 60);
             this.SelectAll.TabIndex = 2;
             this.SelectAll.Text = "综合条件查询";
             this.SelectAll.UseVisualStyleBackColor = true;
@@ -244,15 +218,16 @@
             // 
             // RFIDLog
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(738, 923);
+            this.ClientSize = new System.Drawing.Size(984, 1154);
             this.Controls.Add(this.SelectAll);
             this.Controls.Add(this.groupBox4);
             this.Controls.Add(this.LogContent);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "RFIDLog";
             this.Text = "日志查询";
             this.groupBox1.ResumeLayout(false);
@@ -260,7 +235,6 @@
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LogContent)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
             this.ResumeLayout(false);
@@ -280,11 +254,6 @@
         private System.Windows.Forms.TextBox DeviceNo;
         private System.Windows.Forms.Button DeviceNoSelect;
         private System.Windows.Forms.DataGridView LogContent;
-        private System.Windows.Forms.BindingSource rFIDContentBindingSource;
-        private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn readKindDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn contentDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn;
         private System.Windows.Forms.GroupBox groupBox4;
         private System.Windows.Forms.TextBox Content;
         private System.Windows.Forms.Button ContentSelect;

RFIDSocket/RFIDLog.cs

@@ -42,7 +42,7 @@ namespace RFIDSocket
             if (LogContent != null)
             {
                 LogContent.DataSource = null;
-                LogContent.DataSource = LogControl.LogTimeSelect(rFIDContents, StartTime.Value, EndTime.Value);
+                //LogContent.DataSource = LogControl.LogTimeSelect(rFIDContents, StartTime.Value, EndTime.Value);
             }
         }
 
@@ -51,7 +51,7 @@ namespace RFIDSocket
             if (LogContent != null)
             {
                 LogContent.DataSource = null;
-                LogContent.DataSource = LogControl.LogReadKindSelect(rFIDContents, ReadKind.Text);
+                //LogContent.DataSource = LogControl.LogReadKindSelect(rFIDContents, ReadKind.Text);
             }
         }
 
@@ -65,7 +65,7 @@ namespace RFIDSocket
             if (LogContent != null)
             {
                 LogContent.DataSource = null;
-                LogContent.DataSource = LogControl.LogDeviceNoSelect(rFIDContents, no);
+                //LogContent.DataSource = LogControl.LogDeviceNoSelect(rFIDContents, no);
             }
         }
 
@@ -74,7 +74,7 @@ namespace RFIDSocket
             if (LogContent != null)
             {
                 LogContent.DataSource = null;
-                LogContent.DataSource = LogControl.LogContentSelect(rFIDContents, Content.Text);
+                //LogContent.DataSource = LogControl.LogContentSelect(rFIDContents, Content.Text);
             }
         }
 
@@ -87,15 +87,15 @@ namespace RFIDSocket
             }
             if (LogContent != null)
             {
-                LogContent.DataSource = null;
-                LogContent.DataSource = LogControl.LogTimeSelect(
-                    LogControl.LogReadKindSelect(
-                        LogControl.LogDeviceNoSelect(
-                            LogControl.LogContentSelect(rFIDContents, 
-                    Content.Text), 
-                    no), 
-                    ReadKind.Text), 
-                    StartTime.Value, EndTime.Value);
+                //LogContent.DataSource = null;
+                //LogContent.DataSource = LogControl.LogTimeSelect(
+                //    LogControl.LogReadKindSelect(
+                //        LogControl.LogDeviceNoSelect(
+                //            LogControl.LogContentSelect(rFIDContents, 
+                //    Content.Text), 
+                //    no), 
+                //    ReadKind.Text), 
+                //    StartTime.Value, EndTime.Value);
             }
         }
     }

RFIDSocket/RFIDLog.resx

@@ -117,10 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

RFIDSocket/RFIDSocket.Designer.cs

@@ -38,72 +38,71 @@
             this.label4 = new System.Windows.Forms.Label();
             this.MonitorState = new System.Windows.Forms.Label();
             this.TableTimer = new System.Windows.Forms.Timer(this.components);
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.StateData = new System.Windows.Forms.DataGridView();
-            this.LogTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.HeartbeatData = new System.Windows.Forms.DataGridView();
             this.PgUp = new System.Windows.Forms.Button();
             this.PgDn = new System.Windows.Forms.Button();
             this.PageRange = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.LogStart = new System.Windows.Forms.Button();
-            this.deviceNoDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.timeSpanDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.rFIDHeartbeatBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.deviceNoDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.rFIDStateBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.deviceNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.readKindDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.contentDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.pictureBox5 = new System.Windows.Forms.PictureBox();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
+            this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.DevicePictureBox = new System.Windows.Forms.PictureBox();
+            this.ConnectPictureBox = new System.Windows.Forms.PictureBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.ConnectState = new System.Windows.Forms.Label();
+            this.DeviceState = new System.Windows.Forms.Label();
+            this.TotalCount = new System.Windows.Forms.Label();
+            this.NormalCount = new System.Windows.Forms.Label();
+            this.WarningCount = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.NoReadCount = new System.Windows.Forms.Label();
+            this.NearCount = new System.Windows.Forms.Label();
+            this.MultiCount = new System.Windows.Forms.Label();
+            this.ShortCount = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.CotentData)).BeginInit();
-            this.groupBox2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.StateData)).BeginInit();
-            this.groupBox3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.HeartbeatData)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DevicePictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ConnectPictureBox)).BeginInit();
             this.SuspendLayout();
             // 
             // CotentData
             // 
-            this.CotentData.AutoGenerateColumns = false;
             this.CotentData.ColumnHeadersHeight = 20;
-            this.CotentData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.deviceNoDataGridViewTextBoxColumn,
-            this.readKindDataGridViewTextBoxColumn,
-            this.contentDataGridViewTextBoxColumn,
-            this.logTimeDataGridViewTextBoxColumn});
-            this.CotentData.DataSource = this.rFIDContentBindingSource;
-            this.CotentData.Location = new System.Drawing.Point(9, 103);
-            this.CotentData.Margin = new System.Windows.Forms.Padding(2);
+            this.CotentData.Location = new System.Drawing.Point(12, 129);
+            this.CotentData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CotentData.Name = "CotentData";
             this.CotentData.RowHeadersVisible = false;
             this.CotentData.RowHeadersWidth = 51;
             this.CotentData.RowTemplate.Height = 17;
             this.CotentData.ScrollBars = System.Windows.Forms.ScrollBars.None;
-            this.CotentData.Size = new System.Drawing.Size(486, 870);
+            this.CotentData.Size = new System.Drawing.Size(648, 1088);
             this.CotentData.TabIndex = 0;
             // 
             // IPText
             // 
-            this.IPText.Location = new System.Drawing.Point(116, 23);
-            this.IPText.Margin = new System.Windows.Forms.Padding(2);
+            this.IPText.Location = new System.Drawing.Point(155, 29);
+            this.IPText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IPText.MaxLength = 6;
             this.IPText.Name = "IPText";
-            this.IPText.Size = new System.Drawing.Size(98, 21);
+            this.IPText.Size = new System.Drawing.Size(129, 25);
             this.IPText.TabIndex = 7;
             this.IPText.Text = "127.0.0.1";
             // 
             // SetAddress
             // 
-            this.SetAddress.Location = new System.Drawing.Point(267, 10);
-            this.SetAddress.Margin = new System.Windows.Forms.Padding(2);
+            this.SetAddress.Location = new System.Drawing.Point(356, 12);
+            this.SetAddress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SetAddress.Name = "SetAddress";
-            this.SetAddress.Size = new System.Drawing.Size(120, 45);
+            this.SetAddress.Size = new System.Drawing.Size(160, 56);
             this.SetAddress.TabIndex = 6;
             this.SetAddress.Text = "确认服务端地址";
             this.SetAddress.UseVisualStyleBackColor = true;
@@ -112,29 +111,28 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(11, 27);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Location = new System.Drawing.Point(15, 34);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(101, 12);
+            this.label1.Size = new System.Drawing.Size(128, 15);
             this.label1.TabIndex = 1;
             this.label1.Text = "服务端IP：端口号";
             // 
             // PortText
             // 
-            this.PortText.Location = new System.Drawing.Point(218, 23);
-            this.PortText.Margin = new System.Windows.Forms.Padding(2);
+            this.PortText.Location = new System.Drawing.Point(291, 29);
+            this.PortText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PortText.MaxLength = 6;
             this.PortText.Name = "PortText";
-            this.PortText.Size = new System.Drawing.Size(45, 21);
+            this.PortText.Size = new System.Drawing.Size(59, 25);
             this.PortText.TabIndex = 0;
             this.PortText.Text = "1234";
             // 
             // MonitorOnOff
             // 
-            this.MonitorOnOff.Location = new System.Drawing.Point(391, 11);
-            this.MonitorOnOff.Margin = new System.Windows.Forms.Padding(2);
+            this.MonitorOnOff.Location = new System.Drawing.Point(521, 14);
+            this.MonitorOnOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MonitorOnOff.Name = "MonitorOnOff";
-            this.MonitorOnOff.Size = new System.Drawing.Size(110, 45);
+            this.MonitorOnOff.Size = new System.Drawing.Size(147, 56);
             this.MonitorOnOff.TabIndex = 7;
             this.MonitorOnOff.Text = "启动监听";
             this.MonitorOnOff.UseVisualStyleBackColor = true;
@@ -143,10 +141,9 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(505, 27);
-            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label4.Location = new System.Drawing.Point(673, 34);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(65, 12);
+            this.label4.Size = new System.Drawing.Size(82, 15);
             this.label4.TabIndex = 8;
             this.label4.Text = "监听状态：";
             // 
@@ -154,10 +151,9 @@
             // 
             this.MonitorState.AutoSize = true;
             this.MonitorState.BackColor = System.Drawing.Color.Transparent;
-            this.MonitorState.Location = new System.Drawing.Point(574, 27);
-            this.MonitorState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.MonitorState.Location = new System.Drawing.Point(765, 34);
             this.MonitorState.Name = "MonitorState";
-            this.MonitorState.Size = new System.Drawing.Size(17, 12);
+            this.MonitorState.Size = new System.Drawing.Size(22, 15);
             this.MonitorState.TabIndex = 9;
             this.MonitorState.Text = "关";
             // 
@@ -166,79 +162,12 @@
             this.TableTimer.Interval = 1000;
             this.TableTimer.Tick += new System.EventHandler(this.TableTimer_Tick);
             // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.StateData);
-            this.groupBox2.Location = new System.Drawing.Point(499, 59);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox2.Size = new System.Drawing.Size(186, 449);
-            this.groupBox2.TabIndex = 11;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "工作状态故障";
-            // 
-            // StateData
-            // 
-            this.StateData.AutoGenerateColumns = false;
-            this.StateData.ColumnHeadersHeight = 20;
-            this.StateData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.deviceNoDataGridViewTextBoxColumn1,
-            this.LogTime});
-            this.StateData.DataSource = this.rFIDStateBindingSource;
-            this.StateData.Location = new System.Drawing.Point(4, 19);
-            this.StateData.Margin = new System.Windows.Forms.Padding(2);
-            this.StateData.Name = "StateData";
-            this.StateData.RowHeadersVisible = false;
-            this.StateData.RowHeadersWidth = 51;
-            this.StateData.RowTemplate.Height = 20;
-            this.StateData.Size = new System.Drawing.Size(177, 425);
-            this.StateData.TabIndex = 0;
-            // 
-            // LogTime
-            // 
-            this.LogTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.LogTime.DataPropertyName = "LogTime";
-            this.LogTime.HeaderText = "报警时间";
-            this.LogTime.MinimumWidth = 6;
-            this.LogTime.Name = "LogTime";
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.HeartbeatData);
-            this.groupBox3.Location = new System.Drawing.Point(499, 512);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox3.Size = new System.Drawing.Size(186, 461);
-            this.groupBox3.TabIndex = 12;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "连接故障";
-            // 
-            // HeartbeatData
-            // 
-            this.HeartbeatData.AutoGenerateColumns = false;
-            this.HeartbeatData.ColumnHeadersHeight = 20;
-            this.HeartbeatData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.deviceNoDataGridViewTextBoxColumn2,
-            this.timeSpanDataGridViewTextBoxColumn});
-            this.HeartbeatData.DataSource = this.rFIDHeartbeatBindingSource;
-            this.HeartbeatData.Location = new System.Drawing.Point(4, 19);
-            this.HeartbeatData.Margin = new System.Windows.Forms.Padding(2);
-            this.HeartbeatData.Name = "HeartbeatData";
-            this.HeartbeatData.RowHeadersVisible = false;
-            this.HeartbeatData.RowHeadersWidth = 51;
-            this.HeartbeatData.RowTemplate.Height = 20;
-            this.HeartbeatData.ScrollBars = System.Windows.Forms.ScrollBars.None;
-            this.HeartbeatData.Size = new System.Drawing.Size(177, 437);
-            this.HeartbeatData.TabIndex = 0;
-            // 
             // PgUp
             // 
-            this.PgUp.Location = new System.Drawing.Point(9, 59);
-            this.PgUp.Margin = new System.Windows.Forms.Padding(2);
+            this.PgUp.Location = new System.Drawing.Point(12, 74);
+            this.PgUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PgUp.Name = "PgUp";
-            this.PgUp.Size = new System.Drawing.Size(101, 40);
+            this.PgUp.Size = new System.Drawing.Size(135, 50);
             this.PgUp.TabIndex = 8;
             this.PgUp.Text = "上一页";
             this.PgUp.UseVisualStyleBackColor = true;
@@ -246,10 +175,10 @@
             // 
             // PgDn
             // 
-            this.PgDn.Location = new System.Drawing.Point(394, 59);
-            this.PgDn.Margin = new System.Windows.Forms.Padding(2);
+            this.PgDn.Location = new System.Drawing.Point(525, 74);
+            this.PgDn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PgDn.Name = "PgDn";
-            this.PgDn.Size = new System.Drawing.Size(101, 40);
+            this.PgDn.Size = new System.Drawing.Size(135, 50);
             this.PgDn.TabIndex = 13;
             this.PgDn.Text = "下一页";
             this.PgDn.UseVisualStyleBackColor = true;
@@ -260,10 +189,9 @@
             this.PageRange.AutoSize = true;
             this.PageRange.BackColor = System.Drawing.Color.Transparent;
             this.PageRange.Font = new System.Drawing.Font("宋体", 12F);
-            this.PageRange.Location = new System.Drawing.Point(255, 69);
-            this.PageRange.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PageRange.Location = new System.Drawing.Point(340, 86);
             this.PageRange.Name = "PageRange";
-            this.PageRange.Size = new System.Drawing.Size(55, 16);
+            this.PageRange.Size = new System.Drawing.Size(69, 20);
             this.PageRange.TabIndex = 15;
             this.PageRange.Text = "1 - 50";
             // 
@@ -271,97 +199,281 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 12F);
-            this.label3.Location = new System.Drawing.Point(186, 69);
-            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label3.Location = new System.Drawing.Point(248, 86);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(87, 16);
+            this.label3.Size = new System.Drawing.Size(109, 20);
             this.label3.TabIndex = 14;
             this.label3.Text = "显示条数：";
             // 
             // LogStart
             // 
-            this.LogStart.Location = new System.Drawing.Point(595, 11);
-            this.LogStart.Margin = new System.Windows.Forms.Padding(2);
+            this.LogStart.Location = new System.Drawing.Point(793, 14);
+            this.LogStart.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LogStart.Name = "LogStart";
-            this.LogStart.Size = new System.Drawing.Size(85, 45);
+            this.LogStart.Size = new System.Drawing.Size(113, 56);
             this.LogStart.TabIndex = 16;
             this.LogStart.Text = "日志查询";
             this.LogStart.UseVisualStyleBackColor = true;
             this.LogStart.Click += new System.EventHandler(this.LogStart_Click);
             // 
-            // deviceNoDataGridViewTextBoxColumn2
-            // 
-            this.deviceNoDataGridViewTextBoxColumn2.DataPropertyName = "DeviceNo";
-            this.deviceNoDataGridViewTextBoxColumn2.HeaderText = "编号";
-            this.deviceNoDataGridViewTextBoxColumn2.MinimumWidth = 6;
-            this.deviceNoDataGridViewTextBoxColumn2.Name = "deviceNoDataGridViewTextBoxColumn2";
-            this.deviceNoDataGridViewTextBoxColumn2.Width = 60;
-            // 
-            // timeSpanDataGridViewTextBoxColumn
-            // 
-            this.timeSpanDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.timeSpanDataGridViewTextBoxColumn.DataPropertyName = "TimeSpan";
-            this.timeSpanDataGridViewTextBoxColumn.HeaderText = "距上一次心跳时间";
-            this.timeSpanDataGridViewTextBoxColumn.MinimumWidth = 6;
-            this.timeSpanDataGridViewTextBoxColumn.Name = "timeSpanDataGridViewTextBoxColumn";
-            // 
-            // rFIDHeartbeatBindingSource
-            // 
-            this.rFIDHeartbeatBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDHeartbeat);
-            // 
-            // deviceNoDataGridViewTextBoxColumn1
-            // 
-            this.deviceNoDataGridViewTextBoxColumn1.DataPropertyName = "DeviceNo";
-            this.deviceNoDataGridViewTextBoxColumn1.HeaderText = "编号";
-            this.deviceNoDataGridViewTextBoxColumn1.MinimumWidth = 6;
-            this.deviceNoDataGridViewTextBoxColumn1.Name = "deviceNoDataGridViewTextBoxColumn1";
-            this.deviceNoDataGridViewTextBoxColumn1.Width = 60;
-            // 
-            // rFIDStateBindingSource
-            // 
-            this.rFIDStateBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDState);
-            // 
-            // rFIDContentBindingSource
-            // 
-            this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent);
-            // 
-            // deviceNoDataGridViewTextBoxColumn
-            // 
-            this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo";
-            this.deviceNoDataGridViewTextBoxColumn.HeaderText = "编号";
-            this.deviceNoDataGridViewTextBoxColumn.MinimumWidth = 6;
-            this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn";
-            this.deviceNoDataGridViewTextBoxColumn.Width = 40;
-            // 
-            // readKindDataGridViewTextBoxColumn
-            // 
-            this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind";
-            this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果";
-            this.readKindDataGridViewTextBoxColumn.MinimumWidth = 6;
-            this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn";
-            this.readKindDataGridViewTextBoxColumn.Width = 60;
-            // 
-            // contentDataGridViewTextBoxColumn
-            // 
-            this.contentDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.contentDataGridViewTextBoxColumn.DataPropertyName = "Content";
-            this.contentDataGridViewTextBoxColumn.HeaderText = "条码内容";
-            this.contentDataGridViewTextBoxColumn.MinimumWidth = 6;
-            this.contentDataGridViewTextBoxColumn.Name = "contentDataGridViewTextBoxColumn";
-            // 
-            // logTimeDataGridViewTextBoxColumn
-            // 
-            this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime";
-            this.logTimeDataGridViewTextBoxColumn.HeaderText = "读取时间";
-            this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6;
-            this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn";
-            this.logTimeDataGridViewTextBoxColumn.Width = 105;
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("宋体", 12F);
+            this.label2.Location = new System.Drawing.Point(788, 154);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(89, 20);
+            this.label2.TabIndex = 17;
+            this.label2.Text = "连接状态";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("宋体", 12F);
+            this.label6.Location = new System.Drawing.Point(788, 384);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(69, 20);
+            this.label6.TabIndex = 21;
+            this.label6.Text = "总数量";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("宋体", 12F);
+            this.label7.Location = new System.Drawing.Point(788, 499);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(89, 20);
+            this.label7.TabIndex = 23;
+            this.label7.Text = "正常数量";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("宋体", 12F);
+            this.label8.Location = new System.Drawing.Point(788, 616);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(89, 20);
+            this.label8.TabIndex = 25;
+            this.label8.Text = "异常数量";
+            // 
+            // pictureBox5
+            // 
+            this.pictureBox5.Image = global::RFIDSocket.Properties.Resources.WarningCount;
+            this.pictureBox5.Location = new System.Drawing.Point(719, 617);
+            this.pictureBox5.Name = "pictureBox5";
+            this.pictureBox5.Size = new System.Drawing.Size(60, 60);
+            this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox5.TabIndex = 26;
+            this.pictureBox5.TabStop = false;
+            // 
+            // pictureBox4
+            // 
+            this.pictureBox4.Image = global::RFIDSocket.Properties.Resources.NormalCount;
+            this.pictureBox4.Location = new System.Drawing.Point(719, 500);
+            this.pictureBox4.Name = "pictureBox4";
+            this.pictureBox4.Size = new System.Drawing.Size(60, 60);
+            this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox4.TabIndex = 24;
+            this.pictureBox4.TabStop = false;
+            // 
+            // pictureBox3
+            // 
+            this.pictureBox3.Image = global::RFIDSocket.Properties.Resources.TotalCount;
+            this.pictureBox3.Location = new System.Drawing.Point(719, 385);
+            this.pictureBox3.Name = "pictureBox3";
+            this.pictureBox3.Size = new System.Drawing.Size(60, 60);
+            this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox3.TabIndex = 22;
+            this.pictureBox3.TabStop = false;
+            // 
+            // DevicePictureBox
+            // 
+            this.DevicePictureBox.Image = global::RFIDSocket.Properties.Resources.RunNormal;
+            this.DevicePictureBox.Location = new System.Drawing.Point(719, 268);
+            this.DevicePictureBox.Name = "DevicePictureBox";
+            this.DevicePictureBox.Size = new System.Drawing.Size(60, 60);
+            this.DevicePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.DevicePictureBox.TabIndex = 20;
+            this.DevicePictureBox.TabStop = false;
+            // 
+            // ConnectPictureBox
+            // 
+            this.ConnectPictureBox.Image = global::RFIDSocket.Properties.Resources.ConnectNormal;
+            this.ConnectPictureBox.Location = new System.Drawing.Point(719, 155);
+            this.ConnectPictureBox.Name = "ConnectPictureBox";
+            this.ConnectPictureBox.Size = new System.Drawing.Size(60, 60);
+            this.ConnectPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.ConnectPictureBox.TabIndex = 18;
+            this.ConnectPictureBox.TabStop = false;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("宋体", 12F);
+            this.label5.Location = new System.Drawing.Point(788, 268);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(89, 20);
+            this.label5.TabIndex = 19;
+            this.label5.Text = "设备状态";
+            // 
+            // ConnectState
+            // 
+            this.ConnectState.AutoSize = true;
+            this.ConnectState.Font = new System.Drawing.Font("宋体", 12F);
+            this.ConnectState.Location = new System.Drawing.Point(789, 195);
+            this.ConnectState.Name = "ConnectState";
+            this.ConnectState.Size = new System.Drawing.Size(39, 20);
+            this.ConnectState.TabIndex = 27;
+            this.ConnectState.Text = "NAN";
+            // 
+            // DeviceState
+            // 
+            this.DeviceState.AutoSize = true;
+            this.DeviceState.Font = new System.Drawing.Font("宋体", 12F);
+            this.DeviceState.Location = new System.Drawing.Point(788, 308);
+            this.DeviceState.Name = "DeviceState";
+            this.DeviceState.Size = new System.Drawing.Size(39, 20);
+            this.DeviceState.TabIndex = 28;
+            this.DeviceState.Text = "NAN";
+            // 
+            // TotalCount
+            // 
+            this.TotalCount.AutoSize = true;
+            this.TotalCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.TotalCount.Location = new System.Drawing.Point(789, 425);
+            this.TotalCount.Name = "TotalCount";
+            this.TotalCount.Size = new System.Drawing.Size(39, 20);
+            this.TotalCount.TabIndex = 29;
+            this.TotalCount.Text = "NAN";
+            // 
+            // NormalCount
+            // 
+            this.NormalCount.AutoSize = true;
+            this.NormalCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.NormalCount.Location = new System.Drawing.Point(789, 540);
+            this.NormalCount.Name = "NormalCount";
+            this.NormalCount.Size = new System.Drawing.Size(39, 20);
+            this.NormalCount.TabIndex = 30;
+            this.NormalCount.Text = "NAN";
+            // 
+            // WarningCount
+            // 
+            this.WarningCount.AutoSize = true;
+            this.WarningCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.WarningCount.Location = new System.Drawing.Point(789, 657);
+            this.WarningCount.Name = "WarningCount";
+            this.WarningCount.Size = new System.Drawing.Size(39, 20);
+            this.WarningCount.TabIndex = 31;
+            this.WarningCount.Text = "NAN";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("宋体", 12F);
+            this.label9.Location = new System.Drawing.Point(715, 720);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(89, 20);
+            this.label9.TabIndex = 32;
+            this.label9.Text = "未读取：";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Font = new System.Drawing.Font("宋体", 12F);
+            this.label10.Location = new System.Drawing.Point(715, 753);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(109, 20);
+            this.label10.TabIndex = 33;
+            this.label10.Text = "间距异常：";
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("宋体", 12F);
+            this.label11.Location = new System.Drawing.Point(715, 817);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(89, 20);
+            this.label11.TabIndex = 34;
+            this.label11.Text = "多标签：";
+            // 
+            // NoReadCount
+            // 
+            this.NoReadCount.AutoSize = true;
+            this.NoReadCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.NoReadCount.Location = new System.Drawing.Point(830, 720);
+            this.NoReadCount.Name = "NoReadCount";
+            this.NoReadCount.Size = new System.Drawing.Size(39, 20);
+            this.NoReadCount.TabIndex = 35;
+            this.NoReadCount.Text = "NAN";
+            // 
+            // NearCount
+            // 
+            this.NearCount.AutoSize = true;
+            this.NearCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.NearCount.Location = new System.Drawing.Point(830, 753);
+            this.NearCount.Name = "NearCount";
+            this.NearCount.Size = new System.Drawing.Size(39, 20);
+            this.NearCount.TabIndex = 36;
+            this.NearCount.Text = "NAN";
+            // 
+            // MultiCount
+            // 
+            this.MultiCount.AutoSize = true;
+            this.MultiCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.MultiCount.Location = new System.Drawing.Point(830, 817);
+            this.MultiCount.Name = "MultiCount";
+            this.MultiCount.Size = new System.Drawing.Size(39, 20);
+            this.MultiCount.TabIndex = 37;
+            this.MultiCount.Text = "NAN";
+            // 
+            // ShortCount
+            // 
+            this.ShortCount.AutoSize = true;
+            this.ShortCount.Font = new System.Drawing.Font("宋体", 12F);
+            this.ShortCount.Location = new System.Drawing.Point(830, 785);
+            this.ShortCount.Name = "ShortCount";
+            this.ShortCount.Size = new System.Drawing.Size(39, 20);
+            this.ShortCount.TabIndex = 39;
+            this.ShortCount.Text = "NAN";
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("宋体", 12F);
+            this.label13.Location = new System.Drawing.Point(715, 785);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(89, 20);
+            this.label13.TabIndex = 38;
+            this.label13.Text = "包过短：";
             // 
             // RFIDSocket
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(695, 983);
+            this.ClientSize = new System.Drawing.Size(927, 1229);
+            this.Controls.Add(this.ShortCount);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.MultiCount);
+            this.Controls.Add(this.NearCount);
+            this.Controls.Add(this.NoReadCount);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.label10);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.WarningCount);
+            this.Controls.Add(this.NormalCount);
+            this.Controls.Add(this.TotalCount);
+            this.Controls.Add(this.DeviceState);
+            this.Controls.Add(this.ConnectState);
+            this.Controls.Add(this.pictureBox5);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.pictureBox4);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.pictureBox3);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.DevicePictureBox);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.ConnectPictureBox);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.LogStart);
             this.Controls.Add(this.PageRange);
             this.Controls.Add(this.label3);
@@ -371,24 +483,20 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.PgUp);
             this.Controls.Add(this.PortText);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.MonitorState);
             this.Controls.Add(this.label4);
             this.Controls.Add(this.MonitorOnOff);
             this.Controls.Add(this.CotentData);
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "RFIDSocket";
             this.Text = " 小件监听";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RFIDSocket_FormClosing);
             ((System.ComponentModel.ISupportInitialize)(this.CotentData)).EndInit();
-            this.groupBox2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.StateData)).EndInit();
-            this.groupBox3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.HeartbeatData)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DevicePictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ConnectPictureBox)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -405,26 +513,34 @@
         private System.Windows.Forms.Label MonitorState;
         private System.Windows.Forms.Timer TableTimer;
         private System.Windows.Forms.TextBox IPText;
-        private System.Windows.Forms.BindingSource rFIDContentBindingSource;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.BindingSource rFIDStateBindingSource;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.DataGridView HeartbeatData;
-        private System.Windows.Forms.DataGridView StateData;
-        private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn LogTime;
-        private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn timeSpanDataGridViewTextBoxColumn;
-        private System.Windows.Forms.BindingSource rFIDHeartbeatBindingSource;
         private System.Windows.Forms.Button PgUp;
         private System.Windows.Forms.Button PgDn;
         private System.Windows.Forms.Label PageRange;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Button LogStart;
-        private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn readKindDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn contentDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.PictureBox ConnectPictureBox;
+        private System.Windows.Forms.PictureBox DevicePictureBox;
+        private System.Windows.Forms.PictureBox pictureBox3;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.PictureBox pictureBox4;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.PictureBox pictureBox5;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label ConnectState;
+        private System.Windows.Forms.Label DeviceState;
+        private System.Windows.Forms.Label TotalCount;
+        private System.Windows.Forms.Label NormalCount;
+        private System.Windows.Forms.Label WarningCount;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label NoReadCount;
+        private System.Windows.Forms.Label NearCount;
+        private System.Windows.Forms.Label MultiCount;
+        private System.Windows.Forms.Label ShortCount;
+        private System.Windows.Forms.Label label13;
     }
 }
 

RFIDSocket/RFIDSocket.cs

@@ -103,8 +103,6 @@ namespace RFIDSocket
             RFIDData.GetData();
 
             CotentData.DataSource = null;
-            StateData.DataSource = null;
-            HeartbeatData.DataSource = null;
 
             switch (PageNo)
             {
@@ -115,8 +113,6 @@ namespace RFIDSocket
                     default: ContentPages(0); PageRange.Text = "0 - 50"; break;
             }
 
-            StateData.DataSource = RFIDData.AlarmState;
-            HeartbeatData.DataSource = RFIDData.HeartbeatsState;
         }
 
         private void RFIDSocket_FormClosing(object sender, FormClosingEventArgs e)
@@ -166,5 +162,6 @@ namespace RFIDSocket
             RFIDLog rFIDLog = new RFIDLog();
             rFIDLog.Show();
         }
+
     }
 }

RFIDSocket/RFIDSocket.csproj

@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -79,6 +79,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="RFIDLog.resx">
       <DependentUpon>RFIDLog.cs</DependentUpon>
@@ -120,5 +121,28 @@
   <ItemGroup>
     <Folder Include="Properties\DataSources\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources\ConnectNormal.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources\ConnectWarning.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources\NormalCount.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources\RunNormal.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources\RunWarning.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources\TotalCount.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources\WarningCount.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

RFIDSocket/RFIDSocket.resx

@@ -117,28 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>159, 17</value>
-  </metadata>
   <metadata name="TableTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="LogTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="rFIDStateBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>413, 17</value>
-  </metadata>
-  <metadata name="LogTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="rFIDHeartbeatBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>646, 17</value>
-  </metadata>
-  <metadata name="rFIDHeartbeatBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>646, 17</value>
-  </metadata>
-  <metadata name="rFIDStateBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>413, 17</value>
-  </metadata>
 </root>

RFIDSocket/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="TouchSocket" version="2.0.0-beta.253" targetFramework="net48" />
   <package id="TouchSocket.Core" version="2.0.0-beta.253" targetFramework="net48" />
 </packages>