diff --git a/RFIDSocket/RFIDSocket.Designer.cs b/RFIDSocket/RFIDSocket.Designer.cs index 54315c5..315b4e4 100644 --- a/RFIDSocket/RFIDSocket.Designer.cs +++ b/RFIDSocket/RFIDSocket.Designer.cs @@ -30,6 +30,11 @@ { this.components = new System.ComponentModel.Container(); this.CotentData = 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.IPText = new System.Windows.Forms.TextBox(); this.SetAddress = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); @@ -40,9 +45,14 @@ this.TableTimer = new System.Windows.Forms.Timer(this.components); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.StateData = new System.Windows.Forms.DataGridView(); + this.deviceNoDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.LogTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rFIDStateBindingSource = new System.Windows.Forms.BindingSource(this.components); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.HeartbeatData = new System.Windows.Forms.DataGridView(); + this.deviceNoDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.timeSpanDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rFIDHeartbeatBindingSource = new System.Windows.Forms.BindingSource(this.components); this.PgUp = new System.Windows.Forms.Button(); this.PgDn = new System.Windows.Forms.Button(); this.PageRange = new System.Windows.Forms.Label(); @@ -51,27 +61,21 @@ this.ControlGrupbox = new System.Windows.Forms.GroupBox(); this.MainReadGroupBox = new System.Windows.Forms.GroupBox(); this.PageGroupBox = new System.Windows.Forms.GroupBox(); - 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.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.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.StateData)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).BeginInit(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.HeartbeatData)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).BeginInit(); this.ControlGrupbox.SuspendLayout(); this.MainReadGroupBox.SuspendLayout(); this.PageGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // CotentData @@ -91,9 +95,45 @@ this.CotentData.RowHeadersVisible = false; this.CotentData.RowHeadersWidth = 51; this.CotentData.RowTemplate.Height = 17; - this.CotentData.Size = new System.Drawing.Size(491, 696); + this.CotentData.Size = new System.Drawing.Size(734, 703); this.CotentData.TabIndex = 0; // + // 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; + // + // rFIDContentBindingSource + // + this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); + // // IPText // this.IPText.Location = new System.Drawing.Point(117, 28); @@ -175,14 +215,14 @@ // groupBox2 // this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox2.AutoSize = true; this.groupBox2.Controls.Add(this.StateData); - this.groupBox2.Location = new System.Drawing.Point(518, 138); + this.groupBox2.Location = new System.Drawing.Point(758, 138); 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(185, 658); + this.groupBox2.Size = new System.Drawing.Size(185, 668); this.groupBox2.TabIndex = 11; this.groupBox2.TabStop = false; this.groupBox2.Text = "工作状态故障"; @@ -202,9 +242,17 @@ this.StateData.RowHeadersVisible = false; this.StateData.RowHeadersWidth = 51; this.StateData.RowTemplate.Height = 20; - this.StateData.Size = new System.Drawing.Size(181, 640); + this.StateData.Size = new System.Drawing.Size(181, 650); this.StateData.TabIndex = 0; // + // deviceNoDataGridViewTextBoxColumn1 + // + this.deviceNoDataGridViewTextBoxColumn1.DataPropertyName = "DeviceNo"; + this.deviceNoDataGridViewTextBoxColumn1.HeaderText = "编号"; + this.deviceNoDataGridViewTextBoxColumn1.MinimumWidth = 6; + this.deviceNoDataGridViewTextBoxColumn1.Name = "deviceNoDataGridViewTextBoxColumn1"; + this.deviceNoDataGridViewTextBoxColumn1.Width = 60; + // // LogTime // this.LogTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; @@ -213,16 +261,20 @@ this.LogTime.MinimumWidth = 6; this.LogTime.Name = "LogTime"; // + // rFIDStateBindingSource + // + this.rFIDStateBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDState); + // // groupBox3 // this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox3.Controls.Add(this.HeartbeatData); - this.groupBox3.Location = new System.Drawing.Point(707, 138); + this.groupBox3.Location = new System.Drawing.Point(948, 138); 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, 658); + this.groupBox3.Size = new System.Drawing.Size(185, 668); this.groupBox3.TabIndex = 12; this.groupBox3.TabStop = false; this.groupBox3.Text = "连接故障"; @@ -242,146 +294,9 @@ this.HeartbeatData.RowHeadersVisible = false; this.HeartbeatData.RowHeadersWidth = 51; this.HeartbeatData.RowTemplate.Height = 20; - this.HeartbeatData.Size = new System.Drawing.Size(182, 640); + this.HeartbeatData.Size = new System.Drawing.Size(181, 650); this.HeartbeatData.TabIndex = 0; // - // PgUp - // - this.PgUp.Dock = System.Windows.Forms.DockStyle.Left; - this.PgUp.Location = new System.Drawing.Point(3, 17); - this.PgUp.Margin = new System.Windows.Forms.Padding(2); - this.PgUp.Name = "PgUp"; - this.PgUp.Size = new System.Drawing.Size(101, 45); - this.PgUp.TabIndex = 8; - this.PgUp.Text = "上一页"; - this.PgUp.UseVisualStyleBackColor = true; - this.PgUp.Click += new System.EventHandler(this.PgUp_Click); - // - // PgDn - // - this.PgDn.Dock = System.Windows.Forms.DockStyle.Right; - this.PgDn.Location = new System.Drawing.Point(393, 17); - this.PgDn.Margin = new System.Windows.Forms.Padding(2); - this.PgDn.Name = "PgDn"; - this.PgDn.Size = new System.Drawing.Size(101, 45); - this.PgDn.TabIndex = 13; - this.PgDn.Text = "下一页"; - this.PgDn.UseVisualStyleBackColor = true; - this.PgDn.Click += new System.EventHandler(this.PgDn_Click); - // - // PageRange - // - 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(259, 29); - this.PageRange.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.PageRange.Name = "PageRange"; - this.PageRange.Size = new System.Drawing.Size(55, 16); - this.PageRange.TabIndex = 15; - this.PageRange.Text = "1 - 50"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("宋体", 12F); - this.label3.Location = new System.Drawing.Point(168, 29); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(87, 16); - this.label3.TabIndex = 14; - this.label3.Text = "显示条数："; - // - // LogStart - // - this.LogStart.Location = new System.Drawing.Point(285, 71); - this.LogStart.Margin = new System.Windows.Forms.Padding(2); - this.LogStart.Name = "LogStart"; - this.LogStart.Size = new System.Drawing.Size(85, 45); - this.LogStart.TabIndex = 16; - this.LogStart.Text = "日志查询"; - this.LogStart.UseVisualStyleBackColor = true; - this.LogStart.Click += new System.EventHandler(this.LogStart_Click); - // - // ControlGrupbox - // - this.ControlGrupbox.Controls.Add(this.LogStart); - this.ControlGrupbox.Controls.Add(this.MonitorOnOff); - this.ControlGrupbox.Controls.Add(this.label4); - this.ControlGrupbox.Controls.Add(this.MonitorState); - this.ControlGrupbox.Controls.Add(this.IPText); - this.ControlGrupbox.Controls.Add(this.PortText); - this.ControlGrupbox.Controls.Add(this.SetAddress); - this.ControlGrupbox.Controls.Add(this.label1); - this.ControlGrupbox.Location = new System.Drawing.Point(518, 12); - this.ControlGrupbox.Name = "ControlGrupbox"; - this.ControlGrupbox.Size = new System.Drawing.Size(375, 121); - this.ControlGrupbox.TabIndex = 17; - this.ControlGrupbox.TabStop = false; - this.ControlGrupbox.Text = "控制面板"; - // - // MainReadGroupBox - // - this.MainReadGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.MainReadGroupBox.AutoSize = true; - this.MainReadGroupBox.Controls.Add(this.CotentData); - this.MainReadGroupBox.Location = new System.Drawing.Point(12, 83); - this.MainReadGroupBox.Name = "MainReadGroupBox"; - this.MainReadGroupBox.Size = new System.Drawing.Size(497, 716); - this.MainReadGroupBox.TabIndex = 18; - this.MainReadGroupBox.TabStop = false; - this.MainReadGroupBox.Text = "数据监控"; - // - // PageGroupBox - // - this.PageGroupBox.Controls.Add(this.label3); - this.PageGroupBox.Controls.Add(this.PgDn); - this.PageGroupBox.Controls.Add(this.PgUp); - this.PageGroupBox.Controls.Add(this.PageRange); - this.PageGroupBox.Location = new System.Drawing.Point(12, 12); - this.PageGroupBox.Name = "PageGroupBox"; - this.PageGroupBox.Size = new System.Drawing.Size(497, 65); - this.PageGroupBox.TabIndex = 0; - this.PageGroupBox.TabStop = false; - this.PageGroupBox.Text = "页码控制"; - // - // 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; - // - // rFIDContentBindingSource - // - this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); - // // deviceNoDataGridViewTextBoxColumn2 // this.deviceNoDataGridViewTextBoxColumn2.DataPropertyName = "DeviceNo"; @@ -402,23 +317,139 @@ // this.rFIDHeartbeatBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDHeartbeat); // - // deviceNoDataGridViewTextBoxColumn1 + // PgUp // - this.deviceNoDataGridViewTextBoxColumn1.DataPropertyName = "DeviceNo"; - this.deviceNoDataGridViewTextBoxColumn1.HeaderText = "编号"; - this.deviceNoDataGridViewTextBoxColumn1.MinimumWidth = 6; - this.deviceNoDataGridViewTextBoxColumn1.Name = "deviceNoDataGridViewTextBoxColumn1"; - this.deviceNoDataGridViewTextBoxColumn1.Width = 60; + this.PgUp.Dock = System.Windows.Forms.DockStyle.Left; + this.PgUp.Location = new System.Drawing.Point(3, 17); + this.PgUp.Margin = new System.Windows.Forms.Padding(2); + this.PgUp.Name = "PgUp"; + this.PgUp.Size = new System.Drawing.Size(95, 45); + this.PgUp.TabIndex = 8; + this.PgUp.Text = "上一页"; + this.PgUp.UseVisualStyleBackColor = true; + this.PgUp.Click += new System.EventHandler(this.PgUp_Click); // - // rFIDStateBindingSource + // PgDn // - this.rFIDStateBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDState); + this.PgDn.Dock = System.Windows.Forms.DockStyle.Right; + this.PgDn.Location = new System.Drawing.Point(641, 17); + this.PgDn.Margin = new System.Windows.Forms.Padding(2); + this.PgDn.Name = "PgDn"; + this.PgDn.Size = new System.Drawing.Size(96, 45); + this.PgDn.TabIndex = 13; + this.PgDn.Text = "下一页"; + this.PgDn.UseVisualStyleBackColor = true; + this.PgDn.Click += new System.EventHandler(this.PgDn_Click); + // + // PageRange + // + this.PageRange.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + 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(114, 11); + this.PageRange.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.PageRange.Name = "PageRange"; + this.PageRange.Size = new System.Drawing.Size(55, 16); + this.PageRange.TabIndex = 15; + this.PageRange.Text = "1 - 50"; + // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("宋体", 12F); + this.label3.Location = new System.Drawing.Point(13, 11); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(87, 16); + this.label3.TabIndex = 14; + this.label3.Text = "显示条数："; + // + // LogStart + // + this.LogStart.Location = new System.Drawing.Point(285, 71); + this.LogStart.Margin = new System.Windows.Forms.Padding(2); + this.LogStart.Name = "LogStart"; + this.LogStart.Size = new System.Drawing.Size(85, 45); + this.LogStart.TabIndex = 16; + this.LogStart.Text = "日志查询"; + this.LogStart.UseVisualStyleBackColor = true; + this.LogStart.Click += new System.EventHandler(this.LogStart_Click); + // + // ControlGrupbox + // + this.ControlGrupbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ControlGrupbox.Controls.Add(this.LogStart); + this.ControlGrupbox.Controls.Add(this.MonitorOnOff); + this.ControlGrupbox.Controls.Add(this.label4); + this.ControlGrupbox.Controls.Add(this.MonitorState); + this.ControlGrupbox.Controls.Add(this.IPText); + this.ControlGrupbox.Controls.Add(this.PortText); + this.ControlGrupbox.Controls.Add(this.SetAddress); + this.ControlGrupbox.Controls.Add(this.label1); + this.ControlGrupbox.Location = new System.Drawing.Point(758, 12); + this.ControlGrupbox.Name = "ControlGrupbox"; + this.ControlGrupbox.Size = new System.Drawing.Size(375, 121); + this.ControlGrupbox.TabIndex = 17; + this.ControlGrupbox.TabStop = false; + this.ControlGrupbox.Text = "控制面板"; + // + // MainReadGroupBox + // + this.MainReadGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MainReadGroupBox.AutoSize = true; + this.MainReadGroupBox.Controls.Add(this.CotentData); + this.MainReadGroupBox.Location = new System.Drawing.Point(12, 83); + this.MainReadGroupBox.Name = "MainReadGroupBox"; + this.MainReadGroupBox.Size = new System.Drawing.Size(740, 723); + this.MainReadGroupBox.TabIndex = 18; + this.MainReadGroupBox.TabStop = false; + this.MainReadGroupBox.Text = "数据监控"; + // + // PageGroupBox + // + this.PageGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.PageGroupBox.Controls.Add(this.panel1); + this.PageGroupBox.Controls.Add(this.PgDn); + this.PageGroupBox.Controls.Add(this.PgUp); + this.PageGroupBox.Location = new System.Drawing.Point(12, 12); + this.PageGroupBox.Name = "PageGroupBox"; + this.PageGroupBox.Size = new System.Drawing.Size(740, 65); + this.PageGroupBox.TabIndex = 0; + this.PageGroupBox.TabStop = false; + this.PageGroupBox.Text = "页码控制"; + // + // panel1 + // + this.panel1.Controls.Add(this.panel2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(98, 17); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(543, 45); + this.panel1.TabIndex = 16; + // + // panel2 + // + this.panel2.Anchor = System.Windows.Forms.AnchorStyles.None; + this.panel2.Controls.Add(this.PageRange); + this.panel2.Controls.Add(this.label3); + this.panel2.Location = new System.Drawing.Point(176, 3); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(190, 39); + this.panel2.TabIndex = 16; // // RFIDSocket // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(909, 811); + this.AutoScroll = true; + this.ClientSize = new System.Drawing.Size(1145, 817); this.Controls.Add(this.PageGroupBox); this.Controls.Add(this.MainReadGroupBox); this.Controls.Add(this.ControlGrupbox); @@ -429,18 +460,20 @@ this.Text = "小件监控"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RFIDSocket_FormClosing); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); this.groupBox2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.StateData)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).EndInit(); this.groupBox3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.HeartbeatData)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).EndInit(); this.ControlGrupbox.ResumeLayout(false); this.ControlGrupbox.PerformLayout(); this.MainReadGroupBox.ResumeLayout(false); this.PageGroupBox.ResumeLayout(false); - this.PageGroupBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -480,6 +513,8 @@ private System.Windows.Forms.GroupBox ControlGrupbox; private System.Windows.Forms.GroupBox MainReadGroupBox; private System.Windows.Forms.GroupBox PageGroupBox; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; } } diff --git a/RFIDSocket/RFIDSocket.cs b/RFIDSocket/RFIDSocket.cs index 1a23553..5dcd7e0 100644 --- a/RFIDSocket/RFIDSocket.cs +++ b/RFIDSocket/RFIDSocket.cs @@ -70,7 +70,7 @@ namespace RFIDSocket } else if (Server.State == ServerState.Running) { - if (Server.ServerStop()) + if (Server.ServerStop() || Server.ServerDispose()) { MessageBox.Show("监听服务关闭成功！"); TableTimer.Enabled = false;