winform模块调整

PLCLinker/centralController/Entry/MainEntry.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WpfApp1.Entry
+namespace Entry
 {
     public class MainEntry
     {

PLCLinker/centralController/Entry/SystemInitializer.cs

@@ -12,7 +12,7 @@ using PLCS7;
 using S7.Net;
 using WebServer;
 
-namespace WpfApp1.Entry
+namespace Entry
 {
     public class SystemInitializer
     {
@@ -49,8 +49,13 @@ namespace WpfApp1.Entry
         public static BroadcastBoard allInOneMachine;
         public static string allInOneMachineIP { get; set; }
         public static int allInOneMachinePort { get; set; }
+        /// <summary>
+        /// 号牌机操作句柄
+        /// </summary>
         public static INumMachineLinker numMachineLinker;
-
+        /// <summary>
+        /// 本地web操作句柄
+        /// </summary>
         public static IWebServer webServer;
         public static int webPort { get; set; }
         /// <summary>
@@ -147,7 +152,11 @@ namespace WpfApp1.Entry
                     break;
             }
         }
-
+        /// <summary>
+        /// PLC初始化与连接
+        /// </summary>
+        /// <param name="retryCount"></param>
+        /// <returns></returns>
         public static bool PLCInit(int retryCount)
         {
             int temp = retryCount;
@@ -168,7 +177,9 @@ namespace WpfApp1.Entry
             }
             return false;
         }
-
+        /// <summary>
+        /// 系统关闭
+        /// </summary>
         public static void Stop()
         {
             //关闭号牌机

PLCLinker/centralController/Form1.Designer.cs

@@ -1,6 +1,6 @@
 namespace centralController
 {
-    partial class Form1
+    partial class centralController
     {
         /// <summary>
         /// 必需的设计器变量。
@@ -33,20 +33,21 @@
             this.dockSite4 = new DevComponents.DotNetBar.DockSite();
             this.dockSite9 = new DevComponents.DotNetBar.DockSite();
             this.bar2 = new DevComponents.DotNetBar.Bar();
-            this.RecordsMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.TestContainer = new DevComponents.DotNetBar.PanelDockContainer();
+            this.NumMachineMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.ParkingSpaceMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.RecordsMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.PLCMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.dci_PLC = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_NumMachine = new DevComponents.DotNetBar.DockContainerItem();
-            this.panelDockContainer2 = new DevComponents.DotNetBar.PanelDockContainer();
             this.dci_ParkingSpace = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_ParkingRecords = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_payment = new DevComponents.DotNetBar.DockContainerItem();
             this.PaymentMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.dci_Test = new DevComponents.DotNetBar.DockContainerItem();
             this.dockSite1 = new DevComponents.DotNetBar.DockSite();
             this.dockSite2 = new DevComponents.DotNetBar.DockSite();
             this.bar3 = new DevComponents.DotNetBar.Bar();
-            this.NumMachineMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.panelDockContainer10 = new DevComponents.DotNetBar.PanelDockContainer();
             this.dockContainerItem4 = new DevComponents.DotNetBar.DockContainerItem();
             this.dockContainerItem5 = new DevComponents.DotNetBar.DockContainerItem();
@@ -63,6 +64,7 @@
             this.buttonItem2 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem7 = new DevComponents.DotNetBar.ButtonItem();
             this.dockSite3 = new DevComponents.DotNetBar.DockSite();
+            this.panelDockContainer2 = new DevComponents.DotNetBar.PanelDockContainer();
             this.dockContainerItem2 = new DevComponents.DotNetBar.DockContainerItem();
             this.groupPanel5 = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.dci_PaymentRecords = new DevComponents.DotNetBar.DockContainerItem();
@@ -72,9 +74,11 @@
             this.dockContainerItem1 = new DevComponents.DotNetBar.DockContainerItem();
             this.panelDockContainer8 = new DevComponents.DotNetBar.PanelDockContainer();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
             this.dockSite9.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar2)).BeginInit();
             this.bar2.SuspendLayout();
+            this.TestContainer.SuspendLayout();
             this.dockSite2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar3)).BeginInit();
             this.bar3.SuspendLayout();
@@ -125,10 +129,10 @@
             this.dockSite9.Controls.Add(this.bar2);
             this.dockSite9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dockSite9.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
-            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar2, 569, 424)))}, DevComponents.DotNetBar.eOrientation.Horizontal);
+            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar2, 554, 424)))}, DevComponents.DotNetBar.eOrientation.Horizontal);
             this.dockSite9.Location = new System.Drawing.Point(0, 25);
             this.dockSite9.Name = "dockSite9";
-            this.dockSite9.Size = new System.Drawing.Size(569, 424);
+            this.dockSite9.Size = new System.Drawing.Size(554, 424);
             this.dockSite9.TabIndex = 8;
             this.dockSite9.TabStop = false;
             // 
@@ -146,10 +150,10 @@
             this.bar2.CanDockTop = false;
             this.bar2.CanHide = true;
             this.bar2.CanUndock = false;
-            this.bar2.Controls.Add(this.RecordsMonitorPanel);
-            this.bar2.Controls.Add(this.ParkingSpaceMonitorPanel);
-            this.bar2.Controls.Add(this.NumMachineMonitorPanel);
+            this.bar2.Controls.Add(this.TestContainer);
             this.bar2.Controls.Add(this.PLCMonitorPanel);
+            this.bar2.Controls.Add(this.ParkingSpaceMonitorPanel);
+            this.bar2.Controls.Add(this.RecordsMonitorPanel);
             this.bar2.DockTabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Top;
             this.bar2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bar2.IsMaximized = false;
@@ -158,13 +162,14 @@
             this.dci_NumMachine,
             this.dci_ParkingSpace,
             this.dci_ParkingRecords,
-            this.dci_payment});
+            this.dci_payment,
+            this.dci_Test});
             this.bar2.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
             this.bar2.Location = new System.Drawing.Point(0, 0);
             this.bar2.Name = "bar2";
-            this.bar2.SelectedDockTab = 4;
+            this.bar2.SelectedDockTab = 5;
             this.bar2.SingleLineColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.bar2.Size = new System.Drawing.Size(569, 424);
+            this.bar2.Size = new System.Drawing.Size(554, 424);
             this.bar2.Stretch = true;
             this.bar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar2.TabIndex = 0;
@@ -172,25 +177,39 @@
             this.bar2.TabStop = false;
             this.bar2.ItemClick += new System.EventHandler(this.bar2_ItemClick_1);
             // 
-            // RecordsMonitorPanel
+            // TestContainer
             // 
-            this.RecordsMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.RecordsMonitorPanel.Location = new System.Drawing.Point(3, 28);
-            this.RecordsMonitorPanel.Name = "RecordsMonitorPanel";
-            this.RecordsMonitorPanel.Size = new System.Drawing.Size(563, 393);
-            this.RecordsMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.RecordsMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.RecordsMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.RecordsMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.RecordsMonitorPanel.Style.GradientAngle = 90;
-            this.RecordsMonitorPanel.TabIndex = 13;
+            this.TestContainer.Controls.Add(this.flowLayoutPanel1);
+            this.TestContainer.DisabledBackColor = System.Drawing.Color.Empty;
+            this.TestContainer.Location = new System.Drawing.Point(3, 28);
+            this.TestContainer.Name = "TestContainer";
+            this.TestContainer.Size = new System.Drawing.Size(548, 393);
+            this.TestContainer.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.TestContainer.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.TestContainer.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.TestContainer.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.TestContainer.Style.GradientAngle = 90;
+            this.TestContainer.TabIndex = 24;
+            // 
+            // NumMachineMonitorPanel
+            // 
+            this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 23);
+            this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
+            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(215, 373);
+            this.NumMachineMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.NumMachineMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.NumMachineMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.NumMachineMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.NumMachineMonitorPanel.Style.GradientAngle = 90;
+            this.NumMachineMonitorPanel.TabIndex = 0;
             // 
             // ParkingSpaceMonitorPanel
             // 
             this.ParkingSpaceMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.ParkingSpaceMonitorPanel.Location = new System.Drawing.Point(3, 28);
             this.ParkingSpaceMonitorPanel.Name = "ParkingSpaceMonitorPanel";
-            this.ParkingSpaceMonitorPanel.Size = new System.Drawing.Size(563, 393);
+            this.ParkingSpaceMonitorPanel.Size = new System.Drawing.Size(548, 393);
             this.ParkingSpaceMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.ParkingSpaceMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.ParkingSpaceMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -198,12 +217,25 @@
             this.ParkingSpaceMonitorPanel.Style.GradientAngle = 90;
             this.ParkingSpaceMonitorPanel.TabIndex = 9;
             // 
+            // RecordsMonitorPanel
+            // 
+            this.RecordsMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.RecordsMonitorPanel.Location = new System.Drawing.Point(3, 28);
+            this.RecordsMonitorPanel.Name = "RecordsMonitorPanel";
+            this.RecordsMonitorPanel.Size = new System.Drawing.Size(548, 393);
+            this.RecordsMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.RecordsMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.RecordsMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.RecordsMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.RecordsMonitorPanel.Style.GradientAngle = 90;
+            this.RecordsMonitorPanel.TabIndex = 13;
+            // 
             // PLCMonitorPanel
             // 
             this.PLCMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.PLCMonitorPanel.Location = new System.Drawing.Point(3, 28);
             this.PLCMonitorPanel.Name = "PLCMonitorPanel";
-            this.PLCMonitorPanel.Size = new System.Drawing.Size(563, 393);
+            this.PLCMonitorPanel.Size = new System.Drawing.Size(548, 393);
             this.PLCMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.PLCMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.PLCMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -223,19 +255,6 @@
             this.dci_NumMachine.Name = "dci_NumMachine";
             this.dci_NumMachine.Text = "号牌机监控";
             // 
-            // panelDockContainer2
-            // 
-            this.panelDockContainer2.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelDockContainer2.Location = new System.Drawing.Point(3, 28);
-            this.panelDockContainer2.Name = "panelDockContainer2";
-            this.panelDockContainer2.Size = new System.Drawing.Size(563, 393);
-            this.panelDockContainer2.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelDockContainer2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.panelDockContainer2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.panelDockContainer2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.panelDockContainer2.Style.GradientAngle = 90;
-            this.panelDockContainer2.TabIndex = 5;
-            // 
             // dci_ParkingSpace
             // 
             this.dci_ParkingSpace.Control = this.ParkingSpaceMonitorPanel;
@@ -259,7 +278,7 @@
             this.PaymentMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.PaymentMonitorPanel.Location = new System.Drawing.Point(3, 28);
             this.PaymentMonitorPanel.Name = "PaymentMonitorPanel";
-            this.PaymentMonitorPanel.Size = new System.Drawing.Size(563, 393);
+            this.PaymentMonitorPanel.Size = new System.Drawing.Size(548, 393);
             this.PaymentMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.PaymentMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.PaymentMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -267,6 +286,12 @@
             this.PaymentMonitorPanel.Style.GradientAngle = 90;
             this.PaymentMonitorPanel.TabIndex = 17;
             // 
+            // dci_Test
+            // 
+            this.dci_Test.Control = this.TestContainer;
+            this.dci_Test.Name = "dci_Test";
+            this.dci_Test.Text = "测试项";
+            // 
             // dockSite1
             // 
             this.dockSite1.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
@@ -284,10 +309,10 @@
             this.dockSite2.Controls.Add(this.bar3);
             this.dockSite2.Dock = System.Windows.Forms.DockStyle.Right;
             this.dockSite2.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
-            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar3, 206, 424)))}, DevComponents.DotNetBar.eOrientation.Horizontal);
-            this.dockSite2.Location = new System.Drawing.Point(569, 25);
+            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar3, 221, 424)))}, DevComponents.DotNetBar.eOrientation.Horizontal);
+            this.dockSite2.Location = new System.Drawing.Point(554, 25);
             this.dockSite2.Name = "dockSite2";
-            this.dockSite2.Size = new System.Drawing.Size(209, 424);
+            this.dockSite2.Size = new System.Drawing.Size(224, 424);
             this.dockSite2.TabIndex = 1;
             this.dockSite2.TabStop = false;
             // 
@@ -298,6 +323,7 @@
             this.bar3.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
             this.bar3.AutoSyncBarCaption = true;
             this.bar3.CloseSingleTab = true;
+            this.bar3.Controls.Add(this.NumMachineMonitorPanel);
             this.bar3.Controls.Add(this.panelDockContainer10);
             this.bar3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bar3.GrabHandleStyle = DevComponents.DotNetBar.eGrabHandleStyle.Caption;
@@ -309,32 +335,19 @@
             this.bar3.Location = new System.Drawing.Point(3, 0);
             this.bar3.Name = "bar3";
             this.bar3.SelectedDockTab = 0;
-            this.bar3.Size = new System.Drawing.Size(206, 424);
+            this.bar3.Size = new System.Drawing.Size(221, 424);
             this.bar3.Stretch = true;
             this.bar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar3.TabIndex = 0;
             this.bar3.TabStop = false;
             this.bar3.Text = "警告与提示";
             // 
-            // NumMachineMonitorPanel
-            // 
-            this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 23);
-            this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
-            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(200, 373);
-            this.NumMachineMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.NumMachineMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.NumMachineMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.NumMachineMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.NumMachineMonitorPanel.Style.GradientAngle = 90;
-            this.NumMachineMonitorPanel.TabIndex = 0;
-            // 
             // panelDockContainer10
             // 
             this.panelDockContainer10.DisabledBackColor = System.Drawing.Color.Empty;
             this.panelDockContainer10.Location = new System.Drawing.Point(3, 23);
             this.panelDockContainer10.Name = "panelDockContainer10";
-            this.panelDockContainer10.Size = new System.Drawing.Size(200, 373);
+            this.panelDockContainer10.Size = new System.Drawing.Size(215, 373);
             this.panelDockContainer10.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panelDockContainer10.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.panelDockContainer10.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -394,7 +407,7 @@
             this.dockSite7.Size = new System.Drawing.Size(778, 25);
             this.dockSite7.TabIndex = 6;
             this.dockSite7.TabStop = false;
-            this.dockSite7.Click += new System.EventHandler(this.dockSite7_Click);
+            //this.dockSite7.Click += new System.EventHandler(this.dockSite7_Click);
             // 
             // bar1
             // 
@@ -472,6 +485,19 @@
             this.dockSite3.TabIndex = 2;
             this.dockSite3.TabStop = false;
             // 
+            // panelDockContainer2
+            // 
+            this.panelDockContainer2.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelDockContainer2.Location = new System.Drawing.Point(3, 28);
+            this.panelDockContainer2.Name = "panelDockContainer2";
+            this.panelDockContainer2.Size = new System.Drawing.Size(563, 393);
+            this.panelDockContainer2.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelDockContainer2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.panelDockContainer2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.panelDockContainer2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.panelDockContainer2.Style.GradientAngle = 90;
+            this.panelDockContainer2.TabIndex = 5;
+            // 
             // dockContainerItem2
             // 
             this.dockContainerItem2.Control = this.panelDockContainer2;
@@ -608,7 +634,14 @@
             this.panelDockContainer8.Style.GradientAngle = 90;
             this.panelDockContainer8.TabIndex = 37;
             // 
-            // Form1
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 3);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(543, 380);
+            this.flowLayoutPanel1.TabIndex = 0;
+            // 
+            // centralController
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -623,11 +656,12 @@
             this.Controls.Add(this.dockSite7);
             this.Controls.Add(this.dockSite8);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "Form1";
+            this.Name = "centralController";
             this.Text = "Form1";
             this.dockSite9.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.bar2)).EndInit();
             this.bar2.ResumeLayout(false);
+            this.TestContainer.ResumeLayout(false);
             this.dockSite2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.bar3)).EndInit();
             this.bar3.ResumeLayout(false);
@@ -684,6 +718,9 @@
         private DevComponents.DotNetBar.DockContainerItem dockContainerItem4;
         private DevComponents.DotNetBar.DockContainerItem dockContainerItem5;
         private System.Windows.Forms.BindingSource bindingSource1;
+        private DevComponents.DotNetBar.PanelDockContainer TestContainer;
+        private DevComponents.DotNetBar.DockContainerItem dci_Test;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
     }
 }
 

PLCLinker/centralController/Form1.cs

@@ -10,7 +10,7 @@ using System.Windows.Forms;
 
 namespace centralController
 {
-    public partial class Form1 : Form
+    public partial class centralController : Form
     {
         private void buttonItem1_Click(object sender, EventArgs e)
         {

PLCLinker/centralController/NumMachine/NumMachine.cs

@@ -12,11 +12,10 @@ using parkMonitor.entity;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Configuration;
-using WpfApp1.Entry;
+using Entry;
 
 namespace NumMachine
 {
-
     /// <summary>
     /// 号牌机通信类
     /// </summary>
@@ -585,9 +584,9 @@ namespace NumMachine
             pic = IntPtr.Zero;
             PictureBox pb = new PictureBox
             {
-                Width = 230,
-                Height = 180,
-                Bounds = new System.Drawing.Rectangle(0, 0, 230, 180),
+                Width = 181,
+                Height = 127,
+                //Bounds = new System.Drawing.Rectangle(0, 0, 230, 180),
                 Name = "PictureBox" + Convert.ToString(index)
             };
             lock (namePicMap)

PLCLinker/centralController/Program.cs

@@ -11,12 +11,12 @@ namespace centralController
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>
-        [STAThread]
+        //[STAThread]
         static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new centralController());
         }
     }
 }

PLCLinker/centralController/bin/Release/centralController.exe.config

@@ -3,4 +3,33 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
+  <appSettings>
+    <add key="retryCount" value="3"/>
+    <!--数据库信息-->
+    <!--<add key="remoteDBConnStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;"/>-->
+    <add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_remote;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="DBtimeout" value="3"/>
+    <!--号牌机信息-->
+    <add key="192.168.0.20" value="2"/>
+    <add key="192.168.0.21" value="1"/>
+    <add key="filterRatio" value="0.7"/>
+    <!--PLC基本配置-->
+    <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
+    <add key="plcIpAddress" value="192.168.0.1" />
+    <add key="plcRack" value="0" />
+    <add key="plcSlot" value="1" />
+    <!--分别对终端、中控、车位-->
+    <add key="plcDatablockId" value="18,22,20" />
+    <add key="plcTerminalCount" value="6" />
+    <add key="plcParkingSpaceCount" value="200" />
+    <add key="plcRefreshInterval" value="200"/>
+    <!--显示屏信息-->
+    <add key="allInOneMachineIP" value="192.168.0.60"/>
+    <add key="allInOneMachinePort" value="8888"/>
+    <!--中控webServer端口-->
+    <add key="webPort" value="9000"/>
+    <!--车库信息-->
+    <add key="garageID" value="1"/>
+  </appSettings>
 </configuration>

PLCLinker/centralController/centralController.csproj

@@ -33,11 +33,41 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="broadcastDLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\broadcast\broadcastDLL.dll</HintPath>
+    </Reference>
+    <Reference Include="DatabaseDLL">
+      <HintPath>sdk\mysql\DatabaseDLL.dll</HintPath>
+    </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\program_files\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
+    <Reference Include="HslCommunication">
+      <HintPath>sdk\VZ_Sdk\HslCommunication.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\log4net\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\mysql\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>sdk\VZ_Sdk\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PLCS7, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\PLC\PLCS7.dll</HintPath>
+    </Reference>
+    <Reference Include="S7.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\PLC\S7.Net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -50,14 +80,34 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="entity\AbstractMessage.cs" />
+    <Compile Include="entity\Jsonhelper.cs" />
+    <Compile Include="Entry\MainEntry.cs" />
+    <Compile Include="Entry\SystemInitializer.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Monitor\IMonitor.cs" />
+    <Compile Include="Monitor\Monitor.cs" />
+    <Compile Include="NumMachine\INumMachineLinker.cs" />
+    <Compile Include="NumMachine\NumMachine.cs" />
+    <Compile Include="NumMachine\VzClientSDK.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SuperAdmin\ISuperAdmin.cs" />
+    <Compile Include="SuperAdmin\SuperAdmin.cs" />
+    <Compile Include="Terminal\ITerminalDisplay.cs" />
+    <Compile Include="Terminal\Terminal.cs" />
+    <Compile Include="tools\BlockingQueue.cs" />
+    <Compile Include="tools\JsonByByteToObjectTools.cs" />
+    <Compile Include="tools\MyTimer.cs" />
+    <Compile Include="WebServer\CentralForWebSocketServer.cs" />
+    <Compile Include="WebServer\IWebServer.cs" />
+    <Compile Include="WebServer\LazySingleton.cs" />
+    <Compile Include="WebServer\MultiSocketThread.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
@@ -84,5 +134,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="sdk\broadcast\broadcastDLL.dll" />
+    <Content Include="sdk\log4net\log4net.dll" />
+    <Content Include="sdk\mysql\MySql.Data.dll" />
+    <Content Include="sdk\PLC\PLCS7.dll" />
+    <Content Include="sdk\PLC\S7.Net.dll" />
+    <Content Include="sdk\VZ_Sdk\iDecoders.dll" />
+    <Content Include="sdk\VZ_Sdk\VzDrawsLib.dll" />
+    <Content Include="sdk\VZ_Sdk\VzLPRSDK.dll" />
+    <Content Include="sdk\VZ_Sdk\VZ_Sdk.dll" />
+    <Resource Include="sdk\log4net\log4net.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-3bea8300775175dea7b3045aef4cd5bf908fca19
+dc49e12240ded26013e8cba2a206cd68019499a7

PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

@@ -3,10 +3,20 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralControl
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\centralController.pdb
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.dll
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.xml
-E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.Form1.resources
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.Properties.Resources.resources
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.csproj.GenerateResource.Cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CoreCompileInputs.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.exe
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.pdb
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.csprojResolveAssemblyReference.cache
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\broadcastDLL.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\DatabaseDLL.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\HslCommunication.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\log4net.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\MySql.Data.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\PLCS7.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\S7.Net.dll
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\log4net.xml
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.g.resources
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.centralController.resources