Jelajahi Sumber

LED屏显示模块调试,界面待完善

yct 5 tahun lalu
induk
melakukan
7ce8e9183a

+ 4 - 4
PLCLinker/centralController/App.config

@@ -15,8 +15,8 @@
     <add key="remoteDBConnStr" value="Data Source=118.31.225.50;port=3306;uid=zx;pooling=true;max pool size=1024;pwd=ZhiXiang436070;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
     <!--<add key="remoteDBConnStr" value="Data Source=192.168.0.152;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;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_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <!--<add key="remoteDBConnStr" value="Data Source=192.168.10.106;port=3306;uid=remote;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="localDBConnStr" value="Data Source=106.14.121.187;port=3306;uid=ubuntu;pooling=true;max pool size=1024;pwd=tommi94;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <!--<add key="localDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>-->
     <add key="DBtimeout" value="3"/>
     <!--号牌机信息-->
     <add key="192.168.0.51" value="2"/>
@@ -36,8 +36,8 @@
     <!--显示屏信息-->
     <!--<add key="allInOneMachineIP" value="192.168.10.90"/>
     <add key="allInOneMachinePort" value="8888"/>-->
-    <add key="allInOneMachineIP" value="192.168.0.189"/>
-    <add key="allInOneMachinePort" value="10001"/>
+    <add key="allInOneMachineIP" value="192.168.0.17"/>
+    <add key="allInOneMachinePort" value="5005"/>
     <!--中控webServer端口,deprecated-->
     <add key="webPort" value="9000"/>
     <!--车库信息-->

+ 67 - 35
PLCLinker/centralController/FormCentralController.Designer.cs

@@ -162,6 +162,8 @@
             this.dockContainerItem1 = new DevComponents.DotNetBar.DockContainerItem();
             this.panelDockContainer8 = new DevComponents.DotNetBar.PanelDockContainer();
             this.controlContainerItem1 = new DevComponents.DotNetBar.ControlContainerItem();
+            this.lbx_led1 = new DevComponents.DotNetBar.LabelX();
+            this.lbx_led1Status = new DevComponents.DotNetBar.LabelX();
             this.dockSite_mainView.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar_mainWin)).BeginInit();
             this.bar_mainWin.SuspendLayout();
@@ -268,11 +270,11 @@
             this.bar_mainWin.CanDockRight = false;
             this.bar_mainWin.CanDockTop = false;
             this.bar_mainWin.CanHide = true;
-            this.bar_mainWin.Controls.Add(this.NumMachineMonitorPanel);
+            this.bar_mainWin.Controls.Add(this.pdc_devStatus);
             this.bar_mainWin.Controls.Add(this.testPanel);
-            this.bar_mainWin.Controls.Add(this.paymentPanel);
             this.bar_mainWin.Controls.Add(this.ParkingSpaceMonitorPanel);
-            this.bar_mainWin.Controls.Add(this.pdc_devStatus);
+            this.bar_mainWin.Controls.Add(this.paymentPanel);
+            this.bar_mainWin.Controls.Add(this.NumMachineMonitorPanel);
             this.bar_mainWin.DockTabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Top;
             this.bar_mainWin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bar_mainWin.IsMaximized = false;
@@ -286,8 +288,9 @@
             this.bar_mainWin.Location = new System.Drawing.Point(0, 0);
             this.bar_mainWin.Margin = new System.Windows.Forms.Padding(4);
             this.bar_mainWin.Name = "bar_mainWin";
-            this.bar_mainWin.SelectedDockTab = 0;
+            this.bar_mainWin.SelectedDockTab = 4;
             this.bar_mainWin.SingleLineColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.bar_mainWin.Size = new System.Drawing.Size(973, 580);
             this.bar_mainWin.Stretch = true;
             this.bar_mainWin.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_mainWin.TabIndex = 0;
@@ -308,7 +311,6 @@
             this.NumMachineMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.NumMachineMonitorPanel.Style.GradientAngle = 90;
             this.NumMachineMonitorPanel.TabIndex = 0;
-            this.NumMachineMonitorPanel.Visible = true;
             // 
             // flowLayoutPanel1
             // 
@@ -345,7 +347,6 @@
             this.testPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.testPanel.Style.GradientAngle = 90;
             this.testPanel.TabIndex = 38;
-            this.testPanel.Visible = true;
             // 
             // button4
             // 
@@ -642,7 +643,6 @@
             this.paymentPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.paymentPanel.Style.GradientAngle = 90;
             this.paymentPanel.TabIndex = 24;
-            this.paymentPanel.Visible = true;
             // 
             // dgvx_payment
             // 
@@ -763,7 +763,7 @@
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 113F));
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33332F));
-            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 125F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 124F));
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F));
             this.tlp_paymentFilter.Controls.Add(this.dtp_paymentEndDate, 3, 0);
             this.tlp_paymentFilter.Controls.Add(this.lbx_paymentStartDate, 0, 0);
@@ -787,10 +787,10 @@
             this.dtp_paymentEndDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.dtp_paymentEndDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtp_paymentEndDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_paymentEndDate.Location = new System.Drawing.Point(397, 25);
+            this.dtp_paymentEndDate.Location = new System.Drawing.Point(398, 25);
             this.dtp_paymentEndDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtp_paymentEndDate.Name = "dtp_paymentEndDate";
-            this.dtp_paymentEndDate.Size = new System.Drawing.Size(159, 31);
+            this.dtp_paymentEndDate.Size = new System.Drawing.Size(160, 31);
             this.dtp_paymentEndDate.TabIndex = 12;
             // 
             // lbx_paymentStartDate
@@ -816,7 +816,7 @@
             this.lbx_paymentEndDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lbx_paymentEndDate.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbx_paymentEndDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbx_paymentEndDate.Location = new System.Drawing.Point(284, 4);
+            this.lbx_paymentEndDate.Location = new System.Drawing.Point(285, 4);
             this.lbx_paymentEndDate.Margin = new System.Windows.Forms.Padding(4);
             this.lbx_paymentEndDate.Name = "lbx_paymentEndDate";
             this.lbx_paymentEndDate.Size = new System.Drawing.Size(105, 74);
@@ -829,7 +829,7 @@
             this.btnx_paymentSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.btnx_paymentSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnx_paymentSearch.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnx_paymentSearch.Location = new System.Drawing.Point(844, 19);
+            this.btnx_paymentSearch.Location = new System.Drawing.Point(846, 19);
             this.btnx_paymentSearch.Margin = new System.Windows.Forms.Padding(4);
             this.btnx_paymentSearch.Name = "btnx_paymentSearch";
             this.btnx_paymentSearch.Size = new System.Drawing.Size(99, 44);
@@ -846,7 +846,7 @@
             this.lbx_paymentLicense.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lbx_paymentLicense.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbx_paymentLicense.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbx_paymentLicense.Location = new System.Drawing.Point(564, 4);
+            this.lbx_paymentLicense.Location = new System.Drawing.Point(566, 4);
             this.lbx_paymentLicense.Margin = new System.Windows.Forms.Padding(4);
             this.lbx_paymentLicense.Name = "lbx_paymentLicense";
             this.lbx_paymentLicense.Size = new System.Drawing.Size(105, 74);
@@ -856,7 +856,7 @@
             // tb_paymentLicense
             // 
             this.tb_paymentLicense.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.tb_paymentLicense.Location = new System.Drawing.Point(677, 26);
+            this.tb_paymentLicense.Location = new System.Drawing.Point(679, 26);
             this.tb_paymentLicense.Margin = new System.Windows.Forms.Padding(4);
             this.tb_paymentLicense.Name = "tb_paymentLicense";
             this.tb_paymentLicense.Size = new System.Drawing.Size(159, 30);
@@ -870,7 +870,7 @@
             this.dtp_paymentStartDate.Location = new System.Drawing.Point(117, 25);
             this.dtp_paymentStartDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtp_paymentStartDate.Name = "dtp_paymentStartDate";
-            this.dtp_paymentStartDate.Size = new System.Drawing.Size(159, 31);
+            this.dtp_paymentStartDate.Size = new System.Drawing.Size(160, 31);
             this.dtp_paymentStartDate.TabIndex = 11;
             // 
             // ParkingSpaceMonitorPanel
@@ -886,7 +886,6 @@
             this.ParkingSpaceMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.ParkingSpaceMonitorPanel.Style.GradientAngle = 90;
             this.ParkingSpaceMonitorPanel.TabIndex = 9;
-            this.ParkingSpaceMonitorPanel.Visible = true;
             // 
             // pdc_devStatus
             // 
@@ -903,7 +902,6 @@
             this.pdc_devStatus.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.pdc_devStatus.Style.GradientAngle = 90;
             this.pdc_devStatus.TabIndex = 43;
-            this.pdc_devStatus.Visible = true;
             // 
             // panel1
             // 
@@ -923,17 +921,21 @@
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.tableLayoutPanel2.Controls.Add(this.lbx_webStatus, 1, 1);
+            this.tableLayoutPanel2.Controls.Add(this.lbx_led1, 0, 2);
             this.tableLayoutPanel2.Controls.Add(this.lbx_PLCStatus, 1, 0);
             this.tableLayoutPanel2.Controls.Add(this.lbx_PLC, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.lbx_web, 0, 1);
+            this.tableLayoutPanel2.Controls.Add(this.lbx_led1Status, 1, 2);
             this.tableLayoutPanel2.Location = new System.Drawing.Point(16, 15);
             this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 3;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(239, 151);
+            this.tableLayoutPanel2.RowCount = 5;
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.99841F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.9984F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.9984F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20.0024F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20.0024F));
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(226, 237);
             this.tableLayoutPanel2.TabIndex = 1;
             // 
             // lbx_webStatus
@@ -944,10 +946,10 @@
             // 
             // 
             this.lbx_webStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lbx_webStatus.Location = new System.Drawing.Point(150, 54);
+            this.lbx_webStatus.Location = new System.Drawing.Point(141, 51);
             this.lbx_webStatus.Margin = new System.Windows.Forms.Padding(4);
             this.lbx_webStatus.Name = "lbx_webStatus";
-            this.lbx_webStatus.Size = new System.Drawing.Size(57, 42);
+            this.lbx_webStatus.Size = new System.Drawing.Size(57, 39);
             this.lbx_webStatus.Symbol = "";
             this.lbx_webStatus.SymbolColor = System.Drawing.Color.Crimson;
             this.lbx_webStatus.SymbolSize = 25F;
@@ -961,10 +963,10 @@
             // 
             // 
             this.lbx_PLCStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lbx_PLCStatus.Location = new System.Drawing.Point(149, 4);
+            this.lbx_PLCStatus.Location = new System.Drawing.Point(140, 4);
             this.lbx_PLCStatus.Margin = new System.Windows.Forms.Padding(4);
             this.lbx_PLCStatus.Name = "lbx_PLCStatus";
-            this.lbx_PLCStatus.Size = new System.Drawing.Size(59, 42);
+            this.lbx_PLCStatus.Size = new System.Drawing.Size(59, 39);
             this.lbx_PLCStatus.Symbol = "";
             this.lbx_PLCStatus.SymbolColor = System.Drawing.Color.Crimson;
             this.lbx_PLCStatus.SymbolSize = 25F;
@@ -980,7 +982,7 @@
             this.lbx_PLC.Location = new System.Drawing.Point(4, 4);
             this.lbx_PLC.Margin = new System.Windows.Forms.Padding(4);
             this.lbx_PLC.Name = "lbx_PLC";
-            this.lbx_PLC.Size = new System.Drawing.Size(111, 42);
+            this.lbx_PLC.Size = new System.Drawing.Size(105, 39);
             this.lbx_PLC.TabIndex = 0;
             this.lbx_PLC.Text = "PLC";
             this.lbx_PLC.TextAlignment = System.Drawing.StringAlignment.Center;
@@ -992,10 +994,10 @@
             // 
             this.lbx_web.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lbx_web.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lbx_web.Location = new System.Drawing.Point(4, 54);
+            this.lbx_web.Location = new System.Drawing.Point(4, 51);
             this.lbx_web.Margin = new System.Windows.Forms.Padding(4);
             this.lbx_web.Name = "lbx_web";
-            this.lbx_web.Size = new System.Drawing.Size(111, 42);
+            this.lbx_web.Size = new System.Drawing.Size(105, 39);
             this.lbx_web.TabIndex = 1;
             this.lbx_web.Text = "web服务器";
             this.lbx_web.TextAlignment = System.Drawing.StringAlignment.Center;
@@ -1055,6 +1057,7 @@
             this.bar_bottom.Margin = new System.Windows.Forms.Padding(4);
             this.bar_bottom.Name = "bar_bottom";
             this.bar_bottom.SelectedDockTab = 0;
+            this.bar_bottom.Size = new System.Drawing.Size(1377, 223);
             this.bar_bottom.Stretch = true;
             this.bar_bottom.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_bottom.TabIndex = 1;
@@ -1074,7 +1077,6 @@
             this.RecordsMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.RecordsMonitorPanel.Style.GradientAngle = 90;
             this.RecordsMonitorPanel.TabIndex = 13;
-            this.RecordsMonitorPanel.Visible = true;
             // 
             // dgvx_parkingRecords
             // 
@@ -1213,6 +1215,7 @@
             this.bar_side.Name = "bar_side";
             this.bar_side.SelectedDockTab = 0;
             this.bar_side.SingleLineColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.bar_side.Size = new System.Drawing.Size(401, 580);
             this.bar_side.Stretch = true;
             this.bar_side.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_side.TabIndex = 2;
@@ -1232,7 +1235,6 @@
             this.terminalMonitorPanel.Style.ForeColor.Color = System.Drawing.SystemColors.MenuHighlight;
             this.terminalMonitorPanel.Style.GradientAngle = 90;
             this.terminalMonitorPanel.TabIndex = 0;
-            this.terminalMonitorPanel.Visible = true;
             // 
             // flp_Term
             // 
@@ -1319,7 +1321,6 @@
             this.warningPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.warningPanel.Style.GradientAngle = 90;
             this.warningPanel.TabIndex = 26;
-            this.warningPanel.Visible = true;
             // 
             // rtb_notification
             // 
@@ -1751,7 +1752,6 @@
             this.panelDockContainer10.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.panelDockContainer10.Style.GradientAngle = 90;
             this.panelDockContainer10.TabIndex = 5;
-            this.panelDockContainer10.Visible = true;
             // 
             // dockContainerItem2
             // 
@@ -1815,7 +1815,6 @@
             this.panelDockContainer7.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.panelDockContainer7.Style.GradientAngle = 90;
             this.panelDockContainer7.TabIndex = 37;
-            this.panelDockContainer7.Visible = true;
             // 
             // dockContainerItem1
             // 
@@ -1835,7 +1834,6 @@
             this.panelDockContainer8.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
             this.panelDockContainer8.Style.GradientAngle = 90;
             this.panelDockContainer8.TabIndex = 37;
-            this.panelDockContainer8.Visible = true;
             // 
             // controlContainerItem1
             // 
@@ -1843,6 +1841,38 @@
             this.controlContainerItem1.MenuVisibility = DevComponents.DotNetBar.eMenuVisibility.VisibleAlways;
             this.controlContainerItem1.Name = "controlContainerItem1";
             // 
+            // lbx_led1
+            // 
+            // 
+            // 
+            // 
+            this.lbx_led1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_led1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_led1.Location = new System.Drawing.Point(3, 98);
+            this.lbx_led1.Margin = new System.Windows.Forms.Padding(4);
+            this.lbx_led1.Name = "lbx_led1";
+            this.lbx_led1.Size = new System.Drawing.Size(105, 42);
+            this.lbx_led1.TabIndex = 4;
+            this.lbx_led1.Text = "led屏1";
+            this.lbx_led1.TextAlignment = System.Drawing.StringAlignment.Center;
+            // 
+            // lbx_led1Status
+            // 
+            this.lbx_led1Status.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
+            this.lbx_led1Status.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            // 
+            // 
+            // 
+            this.lbx_led1Status.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_led1Status.Location = new System.Drawing.Point(142, 98);
+            this.lbx_led1Status.Margin = new System.Windows.Forms.Padding(4);
+            this.lbx_led1Status.Name = "lbx_led1Status";
+            this.lbx_led1Status.Size = new System.Drawing.Size(57, 39);
+            this.lbx_led1Status.Symbol = "";
+            this.lbx_led1Status.SymbolColor = System.Drawing.Color.Crimson;
+            this.lbx_led1Status.SymbolSize = 25F;
+            this.lbx_led1Status.TabIndex = 5;
+            // 
             // centralController
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -2041,6 +2071,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private DevComponents.DotNetBar.LabelX lbx_led1;
+        private DevComponents.DotNetBar.LabelX lbx_led1Status;
     }
 }
 

+ 6 - 0
PLCLinker/centralController/FormCentralController.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="dotNetBarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1124, 143</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -174,6 +177,9 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>37</value>
   </metadata>
+  <metadata name="rtb_notification.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

+ 2 - 2
PLCLinker/centralController/Monitor/Monitor.cs

@@ -63,8 +63,8 @@ namespace Monitor
         /// </summary>
         public static BroadcastBoardManager allInOneMachine;
 
-        public static string allInOneMachineIP { get; set; }
-        public static int allInOneMachinePort { get; set; }
+        public static string[] allInOneMachineIP { get; set; }
+        public static int[] allInOneMachinePort { get; set; }
         /// <summary>
         /// 号牌机操作句柄
         /// </summary>

+ 34 - 3
PLCLinker/centralController/Monitor/SystemInitializer.cs

@@ -13,6 +13,7 @@ using centralController.WebServer;
 using db;
 using MySql.Data.MySqlClient;
 using NumMachine;
+using ONNONLed5KSDKD;
 using parkMonitor.LOG;
 using parkMonitor.tools;
 using PLCS7;
@@ -54,8 +55,14 @@ namespace Monitor
                 Monitor.plcParkingSpaceCount = Convert.ToInt32(ConfigurationManager.AppSettings.Get("plcParkingSpaceCount"));
                 Monitor.plcRefreshInterval = Convert.ToInt32(ConfigurationManager.AppSettings.Get("plcRefreshInterval"));
                 //显示屏
-                //Monitor.allInOneMachineIP = ConfigurationManager.AppSettings.Get("allInOneMachineIP");
-                //Monitor.allInOneMachinePort = Convert.ToInt32(ConfigurationManager.AppSettings.Get("allInOneMachinePort"));
+                Monitor.allInOneMachineIP = ConfigurationManager.AppSettings.Get("allInOneMachineIP").Split(',');
+                string[] ports = ConfigurationManager.AppSettings.Get("allInOneMachinePort").Split(',');
+                if (Monitor.allInOneMachineIP.Length != ports.Length) throw new Exception();
+                Monitor.allInOneMachinePort = new int[ports.Length];
+                for (int i = 0; i < ports.Length; i++)
+                {
+                    Monitor.allInOneMachinePort[i] = Convert.ToInt32(ports[i]);
+                }
                 //webServer端口
                 Monitor.webPort = Convert.ToInt32(ConfigurationManager.AppSettings.Get("webPort"));
                 //车库ID
@@ -74,7 +81,7 @@ namespace Monitor
             catch (Exception e) { Console.WriteLine("初始化," + e.Message); return; }
 
             Monitor.SetNotification("初始化PLC连接...", parkMonitor.model.TextColor.Log);
-            initStatus = initStatus && PLCInit(retryCount);
+            //initStatus = initStatus && PLCInit(retryCount);
             //PLC初始化结束,进入状态2
             if (!initStatus) { Monitor.SetNotification("PLC连接失败,请检查设备", parkMonitor.model.TextColor.Error); return; }
             else { Monitor.initializeState = 2; }
@@ -140,12 +147,36 @@ namespace Monitor
             Monitor.numMachineLinker.Start();
             //初始化显示板对象,显示板udp面向无连接
             Monitor.SetNotification("初始化屏显...", parkMonitor.model.TextColor.Log);
+            Monitor.allInOneMachine = new BroadcastBoardManager();
+            for (int i = 0; i < Monitor.allInOneMachineIP.Length; i++)
+            {
+                Monitor.allInOneMachine.AddScreen(Monitor.allInOneMachine.boardList.Count, Encoding.Default.GetBytes(Monitor.allInOneMachineIP[i]), (uint)Monitor.allInOneMachinePort[i], Led5kSDK.bx_5k_card_type.BX_6K3_YY, 1, 2);
+            }
+            #region 测试屏显
+            //Console.WriteLine(Monitor.allInOneMachine.boardList.Count);
+            //Console.WriteLine(Monitor.allInOneMachine.boardList[0].boardParams.ip + ", " + Monitor.allInOneMachine.boardList[0].boardParams.port);
+            //Monitor.allInOneMachine.boardList[0].UpdateText("上上上", 3);
+            //Monitor.allInOneMachine.boardList[0].UpdateArrow(2);
+            //Thread.Sleep(2000);
+            //Monitor.allInOneMachine.boardList[0].UpdateText("下下下", 3);
+            //Monitor.allInOneMachine.boardList[0].UpdateArrow(3);
+            //Thread.Sleep(2000);
+            //Monitor.allInOneMachine.boardList[0].UpdateText("左左左", 3);
+            //Monitor.allInOneMachine.boardList[0].UpdateArrow(1);
+            //Thread.Sleep(2000);
+            //Monitor.allInOneMachine.boardList[0].UpdateText("右右右", 3);
+            //Monitor.allInOneMachine.boardList[0].UpdateArrow(0);
+            //Thread.Sleep(2000);
+            #endregion 
+
             //BroadcastLinker.Start();
             //Monitor.allInOneMachine = BroadcastLinker.ins;//new BroadcastBoard(Monitor.allInOneMachineIP, Monitor.allInOneMachinePort);
             //初始化广告实例
+            Monitor.SetNotification("初始化广告...", parkMonitor.model.TextColor.Log);
             Monitor.advertMgr = new AdvertManager();
             //initStatus = initStatus && AdvertMgrInit(3);
             //Monitor.AddNotification("test");
+            Monitor.SetNotification("初始化终端...", parkMonitor.model.TextColor.Log);
             Terminal.Terminal.Start();
             //系统初始化结束,进入状态5
             if (!initStatus) { return; }

+ 7 - 1
PLCLinker/centralController/NumMachine/NumMachine.cs

@@ -787,7 +787,13 @@ namespace NumMachine
         /// </summary>
         public void Stop()
         {
-            VzClientSDK.VZLPRClient_StopFindDevice();
+            try
+            {
+                VzClientSDK.VZLPRClient_StopFindDevice();
+            }catch(Exception e)
+            {
+
+            }
             lock (devPicMap)
             {
                 Dictionary<int, IntPtr>.Enumerator enumer = devPicMap.GetEnumerator();

+ 5 - 2
PLCLinker/centralController/allInOneMachine/broadcastModule.cs

@@ -18,6 +18,7 @@ namespace BroadcastModule
 
         public BroadcastBoardManager()
         {
+            header_model = new Led5kSDK.bx_5k_area_header();
             header_model.AreaType = 0x06;
             //横向偏移
             header_model.AreaX = 0;
@@ -44,6 +45,9 @@ namespace BroadcastModule
             //1手动换行 2自动
             header_model.NewLine = 0x01;
             header_model.Timeout = 2;
+
+            Led5kSDK.InitSdk(2, 2);
+            boardList = new List<BroadcastBoard>();
         }
 
         /// <summary>
@@ -130,7 +134,6 @@ namespace BroadcastModule
         {
             handleDynamicAreasMap = new Dictionary<uint, List<Led5kSDK.bx_5k_area_header>>();
             header_model = new Led5kSDK.bx_5k_area_header();
-            Led5kSDK.InitSdk(2, 2);
             area1Lock = new object();
             area2Lock = new object();
             boardParams = new BoardParams(id, ip, port, card_type, handle);
@@ -439,7 +442,7 @@ namespace BroadcastModule
                             Led5kSDK.bx_5k_area_header temp = list[i];
                             temp.DataLen = areaText.Length;
                             if(!soundOnly)
-                                err = Led5kSDK.SCREEN_SendSoundDynamicArea(handle, temp, (ushort)temp.DataLen, areaText, 2, 0, 10, 5, soundText.Length, soundText);
+                                err = Led5kSDK.SCREEN_SendSoundDynamicArea(handle, temp, (ushort)temp.DataLen, areaText, 2, 0, 1, 5, soundText.Length, soundText);
                             else
                                 err = Led5kSDK.SCREEN_SendSoundDynamicArea(handle, temp, 0, Encoding.Default.GetBytes(""), 2, 0, 1, 5, soundText.Length, soundText);
                             break;

+ 20 - 0
PLCLinker/centralController/centralController.csproj

@@ -36,6 +36,26 @@
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="db, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

TEMPAT SAMPAH
PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferences.cache


TEMPAT SAMPAH
PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache


+ 0 - 0
nac_log.txt