فهرست منبع

dotnetbar迁移,vs2013兼容性调整,系统配置界面调整,云端车位表更新操作debug

yct 6 سال پیش
والد
کامیت
8cb38da08f
50فایلهای تغییر یافته به همراه162754 افزوده شده و 253 حذف شده
  1. 2 14
      PLCLinker/CentralController.sln
  2. BIN
      PLCLinker/PLCLinker/bin/Release/PLCLinker.exe
  3. BIN
      PLCLinker/PLCLinker/bin/Release/PLCLinker.pdb
  4. BIN
      PLCLinker/PLCLinker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  5. 3 0
      PLCLinker/PLCLinker/obj/Debug/PLCLinker.csproj.FileListAbsolute.txt
  6. 8 0
      PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.FileListAbsolute.txt
  7. BIN
      PLCLinker/PLCLinker/obj/Release/PLCLinker.csprojResolveAssemblyReference.cache
  8. BIN
      PLCLinker/PLCLinker/obj/Release/PLCLinker.exe
  9. BIN
      PLCLinker/PLCLinker/obj/Release/PLCLinker.pdb
  10. BIN
      PLCLinker/PLCS7/bin/Release/PLCS7.dll
  11. BIN
      PLCLinker/PLCS7/bin/Release/PLCS7.pdb
  12. 6 0
      PLCLinker/PLCS7/obj/Release/PLCS7.csproj.FileListAbsolute.txt
  13. BIN
      PLCLinker/PLCS7/obj/Release/PLCS7.dll
  14. BIN
      PLCLinker/PLCS7/obj/Release/PLCS7.pdb
  15. 8 8
      PLCLinker/centralController/App.config
  16. 202 202
      PLCLinker/centralController/FormCentralController.Designer.cs
  17. 5 2
      PLCLinker/centralController/FormSysConfig.cs
  18. 29 14
      PLCLinker/centralController/Terminal/Terminal.cs
  19. 2 1
      PLCLinker/centralController/WebServer/CentralForWebSocketServer.cs
  20. 4 2
      PLCLinker/centralController/WebServer/WebServer.cs
  21. 25 8
      PLCLinker/centralController/centralController.csproj
  22. 3 1
      PLCLinker/centralController/model/PaymentScheme.cs
  23. BIN
      PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferences.cache
  24. BIN
      PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
  25. BIN
      PLCLinker/centralController/obj/Release/centralController.Properties.Resources.resources
  26. 77 0
      PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt
  27. BIN
      PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache
  28. 1342 0
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Keyboard.XML
  29. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Keyboard.dll
  30. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Layout.Design.dll
  31. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Layout.dll
  32. 13541 0
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Schedule.XML
  33. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Schedule.dll
  34. 25035 0
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.SuperGrid.XML
  35. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.SuperGrid.dll
  36. 40473 0
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.xml
  37. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar2.dll
  38. 78752 0
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar2.xml
  39. 3228 0
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.Instrumentation.XML
  40. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.Instrumentation.dll
  41. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.SuperGrid.Design.dll
  42. BIN
      PLCLinker/centralController/sdk/dotnetbar/DevComponents.TreeGX.dll
  43. 1 1
      PLCLinker/centralController/serversettings.json
  44. BIN
      PLCLinker/socketTest/bin/Release/socketTest.exe
  45. BIN
      PLCLinker/socketTest/bin/Release/socketTest.pdb
  46. BIN
      PLCLinker/socketTest/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
  47. 8 0
      PLCLinker/socketTest/obj/Release/socketTest.csproj.FileListAbsolute.txt
  48. BIN
      PLCLinker/socketTest/obj/Release/socketTest.csproj.GenerateResource.Cache
  49. BIN
      PLCLinker/socketTest/obj/Release/socketTest.exe
  50. BIN
      PLCLinker/socketTest/obj/Release/socketTest.pdb

+ 2 - 14
PLCLinker/CentralController.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLCLinker", "PLCLinker\PLCLinker.csproj", "{2091F0C4-06F2-403A-B660-28E98344309D}"
 EndProject
@@ -11,12 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "centralController", "centra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "socketTest", "socketTest\socketTest.csproj", "{9AB6542B-0FD8-4ED2-8484-CC7F8C23C67D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp1", "WpfApp1\WpfApp1.csproj", "{4B52BB18-B89A-47C0-A20C-27FF628437FE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLCConnector", "PLCConnector\PLCConnector.csproj", "{12254714-E07B-4514-BD5B-EDD0A2C71D62}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NettyTest", "..\NettyCommunication\NettyTest\NettyTest.csproj", "{E693B11B-F146-4EA1-8960-78755FD48DE6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,18 +35,10 @@ Global
 		{9AB6542B-0FD8-4ED2-8484-CC7F8C23C67D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AB6542B-0FD8-4ED2-8484-CC7F8C23C67D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AB6542B-0FD8-4ED2-8484-CC7F8C23C67D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B52BB18-B89A-47C0-A20C-27FF628437FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B52BB18-B89A-47C0-A20C-27FF628437FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B52BB18-B89A-47C0-A20C-27FF628437FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B52BB18-B89A-47C0-A20C-27FF628437FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{12254714-E07B-4514-BD5B-EDD0A2C71D62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12254714-E07B-4514-BD5B-EDD0A2C71D62}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12254714-E07B-4514-BD5B-EDD0A2C71D62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12254714-E07B-4514-BD5B-EDD0A2C71D62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E693B11B-F146-4EA1-8960-78755FD48DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E693B11B-F146-4EA1-8960-78755FD48DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E693B11B-F146-4EA1-8960-78755FD48DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E693B11B-F146-4EA1-8960-78755FD48DE6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

BIN
PLCLinker/PLCLinker/bin/Release/PLCLinker.exe


BIN
PLCLinker/PLCLinker/bin/Release/PLCLinker.pdb


BIN
PLCLinker/PLCLinker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 3 - 0
PLCLinker/PLCLinker/obj/Debug/PLCLinker.csproj.FileListAbsolute.txt

@@ -6,3 +6,6 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\Debug\PLCLinker.csproj.CoreCompileInputs.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\Debug\PLCLinker.exe
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\Debug\PLCLinker.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Debug\PLCLinker.exe.config
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Debug\PLCLinker.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Debug\PLCLinker.pdb

+ 8 - 0
PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.FileListAbsolute.txt

@@ -8,3 +8,11 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.csproj.CoreCompileInputs.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.exe
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCLinker.exe.config
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCLinker.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCLinker.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCS7.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\S7.Net.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCS7.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.pdb

BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.csprojResolveAssemblyReference.cache


BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.exe


BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.pdb


BIN
PLCLinker/PLCS7/bin/Release/PLCS7.dll


BIN
PLCLinker/PLCS7/bin/Release/PLCS7.pdb


+ 6 - 0
PLCLinker/PLCS7/obj/Release/PLCS7.csproj.FileListAbsolute.txt

@@ -6,3 +6,9 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCS7\obj\Rele
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCS7\obj\Release\PLCS7.dll
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCS7\obj\Release\PLCS7.pdb
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\PLCS7\obj\Release\PLCS7.csprojResolveAssemblyReference.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\PLCS7.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\PLCS7.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\PLCS7.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\S7.Net.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.pdb

BIN
PLCLinker/PLCS7/obj/Release/PLCS7.dll


BIN
PLCLinker/PLCS7/obj/Release/PLCS7.pdb


+ 8 - 8
PLCLinker/centralController/App.config

@@ -9,17 +9,17 @@
     <!--数据库信息-->
     <!--<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=192.168.111.61;port=3306;uid=remote;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=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
     <!--<add key="remoteDBConnStr" value="Data Source=192.168.0.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=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;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.10.42" value="1"/>
-    <add key="192.168.10.41" value="2"/>
+    <add key="192.168.0.51" value="2"/>
+    <add key="192.168.0.50" 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.10.60" />
+    <add key="plcIpAddress" value="192.168.0.1" />
     <add key="plcRack" value="0" />
     <add key="plcSlot" value="1" />
     <!--PLCdb块,分别对应终端、中控、车位-->
@@ -28,12 +28,12 @@
     <add key="plcParkingSpaceCount" value="200" />
     <add key="plcRefreshInterval" value="200"/>
     <!--显示屏信息-->
-    <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"/>
     <!--中控webServer端口,deprecated-->
     <add key="webPort" value="9000"/>
     <!--车库信息-->
-    <add key="garageID" value="2"/>
+    <add key="garageID" value="6"/>
     <!--日志写入地址配置文件-->
     <add key="LogAddress" value="c:\\c#workspace\\LogDemo\\LoggerTest" />
     <!--广告存放路径-->

+ 202 - 202
PLCLinker/centralController/FormCentralController.Designer.cs

@@ -35,17 +35,6 @@
             this.dockSite4 = new DevComponents.DotNetBar.DockSite();
             this.dockSite_mainView = new DevComponents.DotNetBar.DockSite();
             this.bar_mainWin = new DevComponents.DotNetBar.Bar();
-            this.pdc_devStatus = new DevComponents.DotNetBar.PanelDockContainer();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.lbx_webStatus = new DevComponents.DotNetBar.LabelX();
-            this.lbx_PLCStatus = new DevComponents.DotNetBar.LabelX();
-            this.lbx_PLC = new DevComponents.DotNetBar.LabelX();
-            this.lbx_web = new DevComponents.DotNetBar.LabelX();
-            this.NumMachineMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.paymentPanel = new DevComponents.DotNetBar.PanelDockContainer();
-            this.ParkingSpaceMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.testPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.groupPanel2 = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.pictureBox4 = new System.Windows.Forms.PictureBox();
@@ -61,6 +50,17 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.NumMachineMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+            this.paymentPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.ParkingSpaceMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.pdc_devStatus = new DevComponents.DotNetBar.PanelDockContainer();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.lbx_webStatus = new DevComponents.DotNetBar.LabelX();
+            this.lbx_PLCStatus = new DevComponents.DotNetBar.LabelX();
+            this.lbx_PLC = new DevComponents.DotNetBar.LabelX();
+            this.lbx_web = new DevComponents.DotNetBar.LabelX();
             this.dci_NumMachine = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_payment = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_ParkingSpace = new DevComponents.DotNetBar.DockContainerItem();
@@ -141,10 +141,6 @@
             this.dockSite_mainView.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar_mainWin)).BeginInit();
             this.bar_mainWin.SuspendLayout();
-            this.pdc_devStatus.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.NumMachineMonitorPanel.SuspendLayout();
             this.testPanel.SuspendLayout();
             this.groupPanel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -154,6 +150,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.NumMachineMonitorPanel.SuspendLayout();
+            this.pdc_devStatus.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.tableLayoutPanel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar_bottom)).BeginInit();
             this.bar_bottom.SuspendLayout();
             this.RecordsMonitorPanel.SuspendLayout();
@@ -216,12 +216,12 @@
             this.dockSite_mainView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dockSite_mainView.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
             ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
-                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_mainWin, 503, 326))),
-                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_side, 360, 326)))}, DevComponents.DotNetBar.eOrientation.Horizontal))),
+                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_mainWin, 503, 328))),
+                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_side, 360, 328)))}, DevComponents.DotNetBar.eOrientation.Horizontal))),
             ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_bottom, 871, 181)))}, DevComponents.DotNetBar.eOrientation.Vertical);
-            this.dockSite_mainView.Location = new System.Drawing.Point(0, 121);
+            this.dockSite_mainView.Location = new System.Drawing.Point(0, 117);
             this.dockSite_mainView.Name = "dockSite_mainView";
-            this.dockSite_mainView.Size = new System.Drawing.Size(866, 547);
+            this.dockSite_mainView.Size = new System.Drawing.Size(866, 551);
             this.dockSite_mainView.TabIndex = 8;
             this.dockSite_mainView.TabStop = false;
             // 
@@ -238,11 +238,11 @@
             this.bar_mainWin.CanDockRight = false;
             this.bar_mainWin.CanDockTop = false;
             this.bar_mainWin.CanHide = true;
-            this.bar_mainWin.Controls.Add(this.testPanel);
+            this.bar_mainWin.Controls.Add(this.pdc_devStatus);
             this.bar_mainWin.Controls.Add(this.NumMachineMonitorPanel);
             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.testPanel);
             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;
@@ -255,169 +255,15 @@
             this.bar_mainWin.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
             this.bar_mainWin.Location = new System.Drawing.Point(0, 0);
             this.bar_mainWin.Name = "bar_mainWin";
-            this.bar_mainWin.SelectedDockTab = 3;
+            this.bar_mainWin.SelectedDockTab = 4;
             this.bar_mainWin.SingleLineColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.bar_mainWin.Size = new System.Drawing.Size(503, 326);
+            this.bar_mainWin.Size = new System.Drawing.Size(503, 328);
             this.bar_mainWin.Stretch = true;
             this.bar_mainWin.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_mainWin.TabIndex = 0;
             this.bar_mainWin.TabNavigation = true;
             this.bar_mainWin.TabStop = false;
             // 
-            // pdc_devStatus
-            // 
-            this.pdc_devStatus.CanvasColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            this.pdc_devStatus.Controls.Add(this.panel1);
-            this.pdc_devStatus.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pdc_devStatus.Location = new System.Drawing.Point(3, 28);
-            this.pdc_devStatus.Name = "pdc_devStatus";
-            this.pdc_devStatus.Size = new System.Drawing.Size(497, 295);
-            this.pdc_devStatus.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.pdc_devStatus.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.pdc_devStatus.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.pdc_devStatus.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.pdc_devStatus.Style.GradientAngle = 90;
-            this.pdc_devStatus.TabIndex = 43;
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            this.panel1.Controls.Add(this.tableLayoutPanel2);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(497, 295);
-            this.panel1.TabIndex = 2;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            this.tableLayoutPanel2.ColumnCount = 2;
-            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_PLCStatus, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.lbx_PLC, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.lbx_web, 0, 1);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(12, 12);
-            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(179, 121);
-            this.tableLayoutPanel2.TabIndex = 1;
-            // 
-            // lbx_webStatus
-            // 
-            this.lbx_webStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-            this.lbx_webStatus.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            // 
-            // 
-            // 
-            this.lbx_webStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lbx_webStatus.Location = new System.Drawing.Point(112, 43);
-            this.lbx_webStatus.Name = "lbx_webStatus";
-            this.lbx_webStatus.Size = new System.Drawing.Size(43, 34);
-            this.lbx_webStatus.Symbol = "";
-            this.lbx_webStatus.SymbolColor = System.Drawing.Color.Crimson;
-            this.lbx_webStatus.SymbolSize = 25F;
-            this.lbx_webStatus.TabIndex = 3;
-            // 
-            // lbx_PLCStatus
-            // 
-            this.lbx_PLCStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-            this.lbx_PLCStatus.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            // 
-            // 
-            // 
-            this.lbx_PLCStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lbx_PLCStatus.Location = new System.Drawing.Point(112, 3);
-            this.lbx_PLCStatus.Name = "lbx_PLCStatus";
-            this.lbx_PLCStatus.Size = new System.Drawing.Size(44, 34);
-            this.lbx_PLCStatus.Symbol = "";
-            this.lbx_PLCStatus.SymbolColor = System.Drawing.Color.Crimson;
-            this.lbx_PLCStatus.SymbolSize = 25F;
-            this.lbx_PLCStatus.TabIndex = 2;
-            // 
-            // lbx_PLC
-            // 
-            // 
-            // 
-            // 
-            this.lbx_PLC.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lbx_PLC.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lbx_PLC.Location = new System.Drawing.Point(3, 3);
-            this.lbx_PLC.Name = "lbx_PLC";
-            this.lbx_PLC.Size = new System.Drawing.Size(83, 34);
-            this.lbx_PLC.TabIndex = 0;
-            this.lbx_PLC.Text = "PLC";
-            this.lbx_PLC.TextAlignment = System.Drawing.StringAlignment.Center;
-            // 
-            // lbx_web
-            // 
-            // 
-            // 
-            // 
-            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(3, 43);
-            this.lbx_web.Name = "lbx_web";
-            this.lbx_web.Size = new System.Drawing.Size(83, 34);
-            this.lbx_web.TabIndex = 1;
-            this.lbx_web.Text = "web服务器";
-            this.lbx_web.TextAlignment = System.Drawing.StringAlignment.Center;
-            // 
-            // NumMachineMonitorPanel
-            // 
-            this.NumMachineMonitorPanel.Controls.Add(this.flowLayoutPanel1);
-            this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 28);
-            this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
-            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(497, 295);
-            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;
-            // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(497, 295);
-            this.flowLayoutPanel1.TabIndex = 1;
-            this.flowLayoutPanel1.Resize += new System.EventHandler(this.flowLayoutPanel1_Resize);
-            // 
-            // paymentPanel
-            // 
-            this.paymentPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.paymentPanel.Location = new System.Drawing.Point(3, 28);
-            this.paymentPanel.Name = "paymentPanel";
-            this.paymentPanel.Size = new System.Drawing.Size(497, 295);
-            this.paymentPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.paymentPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.paymentPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.paymentPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.paymentPanel.Style.GradientAngle = 90;
-            this.paymentPanel.TabIndex = 24;
-            // 
-            // 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(497, 295);
-            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;
-            this.ParkingSpaceMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.ParkingSpaceMonitorPanel.Style.GradientAngle = 90;
-            this.ParkingSpaceMonitorPanel.TabIndex = 9;
-            // 
             // testPanel
             // 
             this.testPanel.Controls.Add(this.groupPanel2);
@@ -431,7 +277,7 @@
             this.testPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.testPanel.Location = new System.Drawing.Point(3, 28);
             this.testPanel.Name = "testPanel";
-            this.testPanel.Size = new System.Drawing.Size(497, 295);
+            this.testPanel.Size = new System.Drawing.Size(497, 297);
             this.testPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.testPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.testPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -654,6 +500,160 @@
             this.labelX1.Text = "label1\r\nlable2";
             this.labelX1.TextAlignment = System.Drawing.StringAlignment.Center;
             // 
+            // NumMachineMonitorPanel
+            // 
+            this.NumMachineMonitorPanel.Controls.Add(this.flowLayoutPanel1);
+            this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 28);
+            this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
+            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(497, 297);
+            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;
+            // 
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(497, 297);
+            this.flowLayoutPanel1.TabIndex = 1;
+            this.flowLayoutPanel1.Resize += new System.EventHandler(this.flowLayoutPanel1_Resize);
+            // 
+            // paymentPanel
+            // 
+            this.paymentPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.paymentPanel.Location = new System.Drawing.Point(3, 28);
+            this.paymentPanel.Name = "paymentPanel";
+            this.paymentPanel.Size = new System.Drawing.Size(497, 297);
+            this.paymentPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.paymentPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.paymentPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.paymentPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.paymentPanel.Style.GradientAngle = 90;
+            this.paymentPanel.TabIndex = 24;
+            // 
+            // 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(497, 297);
+            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;
+            this.ParkingSpaceMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.ParkingSpaceMonitorPanel.Style.GradientAngle = 90;
+            this.ParkingSpaceMonitorPanel.TabIndex = 9;
+            // 
+            // pdc_devStatus
+            // 
+            this.pdc_devStatus.CanvasColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.pdc_devStatus.Controls.Add(this.panel1);
+            this.pdc_devStatus.DisabledBackColor = System.Drawing.Color.Empty;
+            this.pdc_devStatus.Location = new System.Drawing.Point(3, 28);
+            this.pdc_devStatus.Name = "pdc_devStatus";
+            this.pdc_devStatus.Size = new System.Drawing.Size(497, 297);
+            this.pdc_devStatus.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.pdc_devStatus.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.pdc_devStatus.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.pdc_devStatus.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.pdc_devStatus.Style.GradientAngle = 90;
+            this.pdc_devStatus.TabIndex = 43;
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.panel1.Controls.Add(this.tableLayoutPanel2);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(497, 297);
+            this.panel1.TabIndex = 2;
+            // 
+            // tableLayoutPanel2
+            // 
+            this.tableLayoutPanel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.tableLayoutPanel2.ColumnCount = 2;
+            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_PLCStatus, 1, 0);
+            this.tableLayoutPanel2.Controls.Add(this.lbx_PLC, 0, 0);
+            this.tableLayoutPanel2.Controls.Add(this.lbx_web, 0, 1);
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(12, 12);
+            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(179, 121);
+            this.tableLayoutPanel2.TabIndex = 1;
+            // 
+            // lbx_webStatus
+            // 
+            this.lbx_webStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
+            this.lbx_webStatus.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            // 
+            // 
+            // 
+            this.lbx_webStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_webStatus.Location = new System.Drawing.Point(112, 43);
+            this.lbx_webStatus.Name = "lbx_webStatus";
+            this.lbx_webStatus.Size = new System.Drawing.Size(43, 34);
+            this.lbx_webStatus.Symbol = "";
+            this.lbx_webStatus.SymbolColor = System.Drawing.Color.Crimson;
+            this.lbx_webStatus.SymbolSize = 25F;
+            this.lbx_webStatus.TabIndex = 3;
+            // 
+            // lbx_PLCStatus
+            // 
+            this.lbx_PLCStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
+            this.lbx_PLCStatus.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            // 
+            // 
+            // 
+            this.lbx_PLCStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_PLCStatus.Location = new System.Drawing.Point(112, 3);
+            this.lbx_PLCStatus.Name = "lbx_PLCStatus";
+            this.lbx_PLCStatus.Size = new System.Drawing.Size(44, 34);
+            this.lbx_PLCStatus.Symbol = "";
+            this.lbx_PLCStatus.SymbolColor = System.Drawing.Color.Crimson;
+            this.lbx_PLCStatus.SymbolSize = 25F;
+            this.lbx_PLCStatus.TabIndex = 2;
+            // 
+            // lbx_PLC
+            // 
+            // 
+            // 
+            // 
+            this.lbx_PLC.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_PLC.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_PLC.Location = new System.Drawing.Point(3, 3);
+            this.lbx_PLC.Name = "lbx_PLC";
+            this.lbx_PLC.Size = new System.Drawing.Size(83, 34);
+            this.lbx_PLC.TabIndex = 0;
+            this.lbx_PLC.Text = "PLC";
+            this.lbx_PLC.TextAlignment = System.Drawing.StringAlignment.Center;
+            // 
+            // lbx_web
+            // 
+            // 
+            // 
+            // 
+            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(3, 43);
+            this.lbx_web.Name = "lbx_web";
+            this.lbx_web.Size = new System.Drawing.Size(83, 34);
+            this.lbx_web.TabIndex = 1;
+            this.lbx_web.Text = "web服务器";
+            this.lbx_web.TextAlignment = System.Drawing.StringAlignment.Center;
+            // 
             // dci_NumMachine
             // 
             this.dci_NumMachine.Control = this.NumMachineMonitorPanel;
@@ -705,10 +705,10 @@
             this.bar_bottom.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.dci_ParkingRecords});
             this.bar_bottom.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
-            this.bar_bottom.Location = new System.Drawing.Point(0, 329);
+            this.bar_bottom.Location = new System.Drawing.Point(0, 331);
             this.bar_bottom.Name = "bar_bottom";
             this.bar_bottom.SelectedDockTab = 0;
-            this.bar_bottom.Size = new System.Drawing.Size(866, 218);
+            this.bar_bottom.Size = new System.Drawing.Size(866, 220);
             this.bar_bottom.Stretch = true;
             this.bar_bottom.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_bottom.TabIndex = 1;
@@ -720,7 +720,7 @@
             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(860, 187);
+            this.RecordsMonitorPanel.Size = new System.Drawing.Size(860, 189);
             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;
@@ -755,7 +755,7 @@
             this.dgvx_parkingRecords.Location = new System.Drawing.Point(0, 0);
             this.dgvx_parkingRecords.Name = "dgvx_parkingRecords";
             this.dgvx_parkingRecords.RowTemplate.Height = 23;
-            this.dgvx_parkingRecords.Size = new System.Drawing.Size(860, 187);
+            this.dgvx_parkingRecords.Size = new System.Drawing.Size(860, 189);
             this.dgvx_parkingRecords.TabIndex = 0;
             // 
             // parkingRecordsID
@@ -861,7 +861,7 @@
             this.bar_side.Location = new System.Drawing.Point(506, 0);
             this.bar_side.Name = "bar_side";
             this.bar_side.SelectedDockTab = 0;
-            this.bar_side.Size = new System.Drawing.Size(360, 326);
+            this.bar_side.Size = new System.Drawing.Size(360, 328);
             this.bar_side.Stretch = true;
             this.bar_side.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_side.TabIndex = 2;
@@ -873,7 +873,7 @@
             this.terminalMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.terminalMonitorPanel.Location = new System.Drawing.Point(3, 28);
             this.terminalMonitorPanel.Name = "terminalMonitorPanel";
-            this.terminalMonitorPanel.Size = new System.Drawing.Size(354, 295);
+            this.terminalMonitorPanel.Size = new System.Drawing.Size(354, 297);
             this.terminalMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.terminalMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.terminalMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -888,7 +888,7 @@
             this.flp_Term.Location = new System.Drawing.Point(0, 0);
             this.flp_Term.Name = "flp_Term";
             this.flp_Term.Padding = new System.Windows.Forms.Padding(5);
-            this.flp_Term.Size = new System.Drawing.Size(354, 295);
+            this.flp_Term.Size = new System.Drawing.Size(354, 297);
             this.flp_Term.TabIndex = 0;
             // 
             // dci_terminal
@@ -916,10 +916,10 @@
             this.dockSite_notification.Controls.Add(this.bar_notification);
             this.dockSite_notification.Dock = System.Windows.Forms.DockStyle.Right;
             this.dockSite_notification.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
-            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_notification, 325, 547)))}, DevComponents.DotNetBar.eOrientation.Vertical);
-            this.dockSite_notification.Location = new System.Drawing.Point(866, 121);
+            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_notification, 325, 551)))}, DevComponents.DotNetBar.eOrientation.Vertical);
+            this.dockSite_notification.Location = new System.Drawing.Point(866, 117);
             this.dockSite_notification.Name = "dockSite_notification";
-            this.dockSite_notification.Size = new System.Drawing.Size(328, 547);
+            this.dockSite_notification.Size = new System.Drawing.Size(328, 551);
             this.dockSite_notification.TabIndex = 1;
             this.dockSite_notification.TabStop = false;
             // 
@@ -939,7 +939,7 @@
             this.bar_notification.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
             this.bar_notification.Location = new System.Drawing.Point(3, 0);
             this.bar_notification.Name = "bar_notification";
-            this.bar_notification.Size = new System.Drawing.Size(325, 547);
+            this.bar_notification.Size = new System.Drawing.Size(325, 551);
             this.bar_notification.Stretch = true;
             this.bar_notification.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_notification.TabIndex = 1;
@@ -953,7 +953,7 @@
             this.warningPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.warningPanel.Location = new System.Drawing.Point(3, 23);
             this.warningPanel.Name = "warningPanel";
-            this.warningPanel.Size = new System.Drawing.Size(319, 521);
+            this.warningPanel.Size = new System.Drawing.Size(319, 525);
             this.warningPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.warningPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.warningPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -971,14 +971,14 @@
             this.rtb_notification.Location = new System.Drawing.Point(0, 0);
             this.rtb_notification.Name = "rtb_notification";
             this.rtb_notification.ReadOnly = true;
-            this.rtb_notification.Size = new System.Drawing.Size(319, 500);
+            this.rtb_notification.Size = new System.Drawing.Size(319, 504);
             this.rtb_notification.TabIndex = 1;
             this.rtb_notification.Text = "";
             // 
             // progressBar1
             // 
             this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.progressBar1.Location = new System.Drawing.Point(0, 500);
+            this.progressBar1.Location = new System.Drawing.Point(0, 504);
             this.progressBar1.Name = "progressBar1";
             this.progressBar1.Size = new System.Drawing.Size(319, 21);
             this.progressBar1.Step = 20;
@@ -1029,7 +1029,7 @@
             this.dockSite_menu.Dock = System.Windows.Forms.DockStyle.Top;
             this.dockSite_menu.Location = new System.Drawing.Point(0, 0);
             this.dockSite_menu.Name = "dockSite_menu";
-            this.dockSite_menu.Size = new System.Drawing.Size(1194, 121);
+            this.dockSite_menu.Size = new System.Drawing.Size(1194, 117);
             this.dockSite_menu.TabIndex = 6;
             this.dockSite_menu.TabStop = false;
             // 
@@ -1050,7 +1050,7 @@
             this.bar_Menu.Location = new System.Drawing.Point(0, 0);
             this.bar_Menu.MenuBar = true;
             this.bar_Menu.Name = "bar_Menu";
-            this.bar_Menu.Size = new System.Drawing.Size(1194, 26);
+            this.bar_Menu.Size = new System.Drawing.Size(1194, 24);
             this.bar_Menu.Stretch = true;
             this.bar_Menu.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_Menu.TabIndex = 0;
@@ -1250,10 +1250,10 @@
             this.shortcut_sysInfo,
             this.shortcut_about,
             this.shortcut_close});
-            this.bar_shortcut.Location = new System.Drawing.Point(0, 27);
+            this.bar_shortcut.Location = new System.Drawing.Point(0, 25);
             this.bar_shortcut.MenuBar = true;
             this.bar_shortcut.Name = "bar_shortcut";
-            this.bar_shortcut.Size = new System.Drawing.Size(1194, 93);
+            this.bar_shortcut.Size = new System.Drawing.Size(1194, 91);
             this.bar_shortcut.Stretch = true;
             this.bar_shortcut.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_shortcut.TabIndex = 1;
@@ -1266,7 +1266,7 @@
             this.panel_freeSpace.Dock = System.Windows.Forms.DockStyle.Right;
             this.panel_freeSpace.Location = new System.Drawing.Point(866, 0);
             this.panel_freeSpace.Name = "panel_freeSpace";
-            this.panel_freeSpace.Size = new System.Drawing.Size(328, 93);
+            this.panel_freeSpace.Size = new System.Drawing.Size(328, 91);
             this.panel_freeSpace.TabIndex = 3;
             // 
             // lbx_freeSpace
@@ -1282,7 +1282,7 @@
             this.lbx_freeSpace.ForeColor = System.Drawing.Color.Tomato;
             this.lbx_freeSpace.Location = new System.Drawing.Point(0, 0);
             this.lbx_freeSpace.Name = "lbx_freeSpace";
-            this.lbx_freeSpace.Size = new System.Drawing.Size(328, 93);
+            this.lbx_freeSpace.Size = new System.Drawing.Size(328, 91);
             this.lbx_freeSpace.TabIndex = 2;
             this.lbx_freeSpace.Text = "currentFreeSpace";
             this.lbx_freeSpace.TextAlignment = System.Drawing.StringAlignment.Center;
@@ -1475,10 +1475,6 @@
             this.dockSite_mainView.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.bar_mainWin)).EndInit();
             this.bar_mainWin.ResumeLayout(false);
-            this.pdc_devStatus.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.NumMachineMonitorPanel.ResumeLayout(false);
             this.testPanel.ResumeLayout(false);
             this.testPanel.PerformLayout();
             this.groupPanel2.ResumeLayout(false);
@@ -1489,6 +1485,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
             this.tableLayoutPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.NumMachineMonitorPanel.ResumeLayout(false);
+            this.pdc_devStatus.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.tableLayoutPanel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.bar_bottom)).EndInit();
             this.bar_bottom.ResumeLayout(false);
             this.RecordsMonitorPanel.ResumeLayout(false);

+ 5 - 2
PLCLinker/centralController/FormSysConfig.cs

@@ -25,6 +25,7 @@ namespace centralController
 
         private void cb_nmIP_DropDown(object sender, EventArgs e)
         {
+            cb_nmIP.Items.Clear();
             Dictionary<string, int>.Enumerator enumer = Monitor.Monitor.numMachineLinker.GetIpIdMap().GetEnumerator();
             while (enumer.MoveNext())
             {
@@ -42,7 +43,8 @@ namespace centralController
             Dictionary<string, int> dictionary = Monitor.Monitor.numMachineLinker.GetIpIdMap();
             if (dictionary != null && selectedIP != null)
             {
-                bool result = dictionary.TryGetValue(selectedIP, out int id);
+                int id=0;
+                bool result = dictionary.TryGetValue(selectedIP, out id);
                 if (result)
                     tb_nmId.Text = id.ToString();
                 else
@@ -66,7 +68,8 @@ namespace centralController
             }
             else
             {
-                if (int.TryParse(tb_nmId.Text, out int id))
+                int id=0;
+                if (int.TryParse(tb_nmId.Text, out id))
                 {
                     ConfigurationManager.AppSettings.Set(selectedIP, tb_nmId.Text);
                     ConfModify(selectedIP, tb_nmId.Text);

+ 29 - 14
PLCLinker/centralController/Terminal/Terminal.cs

@@ -162,17 +162,27 @@ namespace Terminal
                 }
                 else
                 {
-                    insertParkingSpace = "insert into parkingspace (parkingSpaceID,parkingSpaceX,parkingSpaceY,parkingSpaceZ,parkingSpaceState) values (" + Monitor.Monitor.parkingSpaceInfo[i].parkingSpace + "," + Monitor.Monitor.parkingSpaceInfo[i].coordX +
-                        "," + Monitor.Monitor.parkingSpaceInfo[i].coordY + "," + Monitor.Monitor.parkingSpaceInfo[i].floorNo + "," + Monitor.Monitor.parkingSpaceInfo[i].spaceStatus + ");";
-                    insertSpaceList.Add(insertParkingSpace);
+                    if (!remote)
+                    {
+                        insertParkingSpace = "insert into parkingspace (parkingSpaceID,parkingSpaceX,parkingSpaceY,parkingSpaceZ,parkingSpaceState) values (" + Monitor.Monitor.parkingSpaceInfo[i].parkingSpace + "," + Monitor.Monitor.parkingSpaceInfo[i].coordX +
+                            "," + Monitor.Monitor.parkingSpaceInfo[i].coordY + "," + Monitor.Monitor.parkingSpaceInfo[i].floorNo + "," + Monitor.Monitor.parkingSpaceInfo[i].spaceStatus + ");";
+                        insertSpaceList.Add(insertParkingSpace);
+                    }
+                    else
+                    {
+                        insertParkingSpace = "insert into parkingspace (parkingSpaceID,parkingSpaceX,parkingSpaceY,parkingSpaceZ,parkingSpaceState,garageID,parkingSpaceName) values (" + Monitor.Monitor.parkingSpaceInfo[i].parkingSpace + "," + Monitor.Monitor.parkingSpaceInfo[i].coordX +
+                            "," + Monitor.Monitor.parkingSpaceInfo[i].coordY + "," + Monitor.Monitor.parkingSpaceInfo[i].floorNo + "," + Monitor.Monitor.parkingSpaceInfo[i].spaceStatus + "," + Monitor.Monitor.garageID + ",'默认');";
+                        insertSpaceList.Add(insertParkingSpace);
+                    }
                 }
             }
             try
             {
                 lock (dbHandle)
                 {
+                    int id = 0;
                     dbHandle.UpdateTransaction(updateSpaceList);
-                    dbHandle.Insert(insertSpaceList, out int id);
+                    dbHandle.Insert(insertSpaceList, out id);
                 }
             }
             catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "更新本地所有车位异常"); Console.WriteLine("更新本地所有车位异常" + e.Message); }
@@ -270,13 +280,14 @@ namespace Terminal
 
                         List<string> list = new List<string>();
                         list.Add(insertVehicleWithState);
+                        int id = 0;
                         if (!remote)
                         {
-                            Monitor.Monitor.localDBOper.Insert(list, out int id);
+                            Monitor.Monitor.localDBOper.Insert(list, out id);
                         }
                         else
                         {
-                            Monitor.Monitor.remoteDBOper.Insert(list, out int id);
+                            Monitor.Monitor.remoteDBOper.Insert(list, out id);
                         }
                     }
                     try
@@ -437,7 +448,7 @@ namespace Terminal
                         //判断之前是否已拍摄号牌
                         if (!idLicMap.ContainsKey(term.terminalID))
                         {
-                            license = "";// "桂K88888"; //Monitor.Monitor.numMachineLinker.GetLicensePlate(terminalInfo[i].terminalID);
+                            license = Monitor.Monitor.numMachineLinker.GetLicensePlate(term.terminalID);
                             Monitor.Monitor.SetNotification("启动" + term.terminalID + "号号牌机,号牌:" + license, parkMonitor.model.TextColor.Info);
                         }
                         else
@@ -594,7 +605,8 @@ namespace Terminal
                     //无车位信息则跳出当前循环
                     if (parkingSpaceID == 0 || term.receiptNum == 0)
                     {
-                        try { idLicMap.Remove(currentTerm); } catch { }
+                        try { idLicMap.Remove(currentTerm); }
+                        catch { }
                         Monitor.Monitor.SetNotification("无车位或凭证号", parkMonitor.model.TextColor.Warning);
                         return;
                     }
@@ -614,9 +626,10 @@ namespace Terminal
                     }
                     List<string> list = new List<string>();
                     list.Add(parkingRecordsSql);
-
-                    Monitor.Monitor.localDBOper.Insert(list, out int parkingRecordsID);
-                    Monitor.Monitor.remoteDBOper.Insert(list, out int remoteParkingRecordsID);
+                    int parkingRecordsID = 0;
+                    int remoteParkingRecordsID = 0;
+                    Monitor.Monitor.localDBOper.Insert(list, out parkingRecordsID);
+                    Monitor.Monitor.remoteDBOper.Insert(list, out remoteParkingRecordsID);
                     Log.WriteLog(LogType.process, LogFile.INFO, "停车记录已插入," + license + "停在" + parkingSpaceID + ",凭证号:" + term.receiptNum);
                     Monitor.Monitor.SetNotification("停车记录已插入", parkMonitor.model.TextColor.Info);
 
@@ -643,7 +656,8 @@ namespace Terminal
                     //}
                     //中控清除车牌、凭证号、号牌验证等信息
                     ClearTerminal(term.terminalID);
-                    try { idLicMap.Remove(currentTerm); } catch { }
+                    try { idLicMap.Remove(currentTerm); }
+                    catch { }
                     Monitor.Monitor.SetNotification(license + " 数据库已更新,停车流程结束", parkMonitor.model.TextColor.Info);
                 }
             }
@@ -683,7 +697,7 @@ namespace Terminal
                 short registered = 4;
                 while (license == "" && countdown-- > 0)
                 {
-                    license = "";//"桂K88888"; //Monitor.Monitor.numMachineLinker.GetLicensePlate(terminalInfo[index].terminalID);
+                    license = Monitor.Monitor.numMachineLinker.GetLicensePlate(terminalInfo[index].terminalID);
                 }
                 Monitor.Monitor.SetNotification(terminalInfo[index].terminalID + "号车位收到地感,拍到" + license, parkMonitor.model.TextColor.Log);
                 if (license != "")
@@ -1068,7 +1082,8 @@ namespace Terminal
                 receiptNum = ts.receiptNum;
                 //取车状态、凭证号不为空,查询数据库计费
                 //Console.WriteLine((termIndex != -1) + "," + (termUsedMap.Count >= termIndex) + "," + termUsedMap.TryGetValue(termIndex, out bool valuee) + "," + (!valuee) + "," + (fetchState == 1) + "," + (receiptNum != 0));
-                if (termIndex != -1 && termCalcMap.Count >= termIndex && termCalcMap.TryGetValue(termIndex, out bool value) && !value && ts.cmd == 2 && receiptNum != 0)
+                bool value = false;
+                if (termIndex != -1 && termCalcMap.Count >= termIndex && termCalcMap.TryGetValue(termIndex, out value) && !value && ts.cmd == 2 && receiptNum != 0)
                 {
                     //fetchState = Monitor.Monitor.mainBlockInfo.fetchingRunning;
                     Monitor.Monitor.SetNotification(termIndex + "号终端准备计算费用", parkMonitor.model.TextColor.Log);

+ 2 - 1
PLCLinker/centralController/WebServer/CentralForWebSocketServer.cs

@@ -195,9 +195,10 @@ namespace centralController.WebServer
         private void InsertOrderRecords(string license)
         {
             string insertSql = "";
+            int id = 0;
             List<string> strs = new List<string>();
             strs.Add(insertSql);
-            Monitor.Monitor.localDBOper.Insert(strs, out int id);
+            Monitor.Monitor.localDBOper.Insert(strs, out id);
         }
         private void DownloadAds()
         {

+ 4 - 2
PLCLinker/centralController/WebServer/WebServer.cs

@@ -90,7 +90,8 @@ namespace centralController.WebServer
                 dbHandle = Monitor.Monitor.remoteDBOper;
             if (!dbHandle.UpdateTransaction(vehicleUpdateList))
             {
-                if (!dbHandle.Insert(vehicleInsertList, out int id))
+                int id =0;
+                if (!dbHandle.Insert(vehicleInsertList, out id))
                     return false;
                 else
                     return true;
@@ -168,7 +169,8 @@ namespace centralController.WebServer
         {
             UpdateVehicleState(localDB, parking ? 4 : 5, 0, license);
             //预约记录插入db
-            InsertOrderRecord(localDB, userID, parking, license, orderTime, orderLength, out int currentID);
+            int currentID = 0;
+            InsertOrderRecord(localDB, userID, parking, license, orderTime, orderLength, out currentID);
             ////查询预约记录id号
             //int currentID = FindCurrentOrderRecordID(localDB, license);
             if (currentID == 0) { /*反馈web,预约失败*/ return false; }

+ 25 - 8
PLCLinker/centralController/centralController.csproj

@@ -42,13 +42,22 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>sdk\mysql\db.dll</HintPath>
     </Reference>
-    <Reference Include="DevComponents.DotNetBar.Schedule, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b" />
-    <Reference Include="DevComponents.DotNetBar.SuperGrid, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b" />
+    <Reference Include="DevComponents.DotNetBar.Schedule, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\dotnetbar\DevComponents.DotNetBar.Schedule.dll</HintPath>
+    </Reference>
+    <Reference Include="DevComponents.DotNetBar.SuperGrid, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\dotnetbar\DevComponents.DotNetBar.SuperGrid.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>
+      <HintPath>sdk\dotnetbar\DevComponents.DotNetBar2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevComponents.Instrumentation, Version=12.5.0.2, Culture=neutral, PublicKeyToken=bc4a9d761ea44ef0, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>sdk\dotnetbar\DevComponents.Instrumentation.dll</HintPath>
     </Reference>
-    <Reference Include="DevComponents.Instrumentation, Version=12.5.0.2, Culture=neutral, PublicKeyToken=bc4a9d761ea44ef0" />
     <Reference Include="DotNetty.Buffers">
       <HintPath>sdk\dotNetty\DotNetty.Buffers.dll</HintPath>
     </Reference>
@@ -354,10 +363,18 @@
     <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" />
+    <Content Include="sdk\VZ_Sdk\iDecoders.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sdk\VZ_Sdk\VzDrawsLib.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sdk\VZ_Sdk\VzLPRSDK.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sdk\VZ_Sdk\VZ_Sdk.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="sdk\log4net\log4net.xml" />
   </ItemGroup>
   <ItemGroup>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 3 - 1
PLCLinker/centralController/model/PaymentScheme.cs


BIN
PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferences.cache


BIN
PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache


BIN
PLCLinker/centralController/obj/Release/centralController.Properties.Resources.resources


+ 77 - 0
PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

@@ -77,3 +77,80 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralControl
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\serversettings.json
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.xml
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.FormSysConfig.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.exe.config
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.centralController.exe.config
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.g.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.BaseConfig_From.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\PLC_Communication.FormModbus.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.NetCfg_Form.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.RuleCfg_Form.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.RVideoCfg_Form.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.VideoCfg_Form.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormNumberMachinePreview.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormRecordsManager.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormSysConfig.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormSysInfo.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormPaymentScheme.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.centralController.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\PLCConnector.FormPLCConf.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.Properties.Resources.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.GenerateResource.Cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\serversettings.json
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\broadcastDLL.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\db.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Buffers.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Codecs.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Common.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Handlers.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Transport.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\HslCommunication.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\log4net.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Abstractions.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.FileExtensions.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Json.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Abstractions.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Physical.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.Abstractions.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Primitives.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\MySql.Data.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\nettyCommunication.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\PLCS7.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\S7.Net.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Collections.Immutable.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.CompilerServices.Unsafe.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.InteropServices.RuntimeInformation.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Threading.Tasks.Extensions.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Buffers.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Codecs.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Common.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Handlers.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Transport.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\log4net.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Abstractions.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.FileExtensions.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Json.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Abstractions.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Physical.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.Abstractions.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Primitives.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\PLCS7.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Collections.Immutable.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.CompilerServices.Unsafe.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Threading.Tasks.Extensions.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzLPRSDK.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\iDecoders.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzDrawsLib.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VZ_Sdk.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojResolveAssemblyReference.cache

BIN
PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1342 - 0
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Keyboard.XML


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Keyboard.dll


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Layout.Design.dll


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Layout.dll


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 13541 - 0
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Schedule.XML


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.Schedule.dll


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 25035 - 0
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.SuperGrid.XML


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.SuperGrid.dll


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 40473 - 0
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar.xml


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar2.dll


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 78752 - 0
PLCLinker/centralController/sdk/dotnetbar/DevComponents.DotNetBar2.xml


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 3228 - 0
PLCLinker/centralController/sdk/dotnetbar/DevComponents.Instrumentation.XML


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.Instrumentation.dll


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.SuperGrid.Design.dll


BIN
PLCLinker/centralController/sdk/dotnetbar/DevComponents.TreeGX.dll


+ 1 - 1
PLCLinker/centralController/serversettings.json

@@ -2,7 +2,7 @@
 
   "ssl": "false",
   "host": "192.168.0.106",
-  "garageID":"2",
+  "garageID":"6",
   "port": "9000",
   "size": "1024"
 }

BIN
PLCLinker/socketTest/bin/Release/socketTest.exe


BIN
PLCLinker/socketTest/bin/Release/socketTest.pdb


BIN
PLCLinker/socketTest/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache


+ 8 - 0
PLCLinker/socketTest/obj/Release/socketTest.csproj.FileListAbsolute.txt

@@ -7,3 +7,11 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.csproj.CoreCompileInputs.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\bin\Release\socketTest.exe.config
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\bin\Release\socketTest.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\bin\Release\socketTest.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.Form1.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.Properties.Resources.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.csproj.GenerateResource.Cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb

BIN
PLCLinker/socketTest/obj/Release/socketTest.csproj.GenerateResource.Cache


BIN
PLCLinker/socketTest/obj/Release/socketTest.exe


BIN
PLCLinker/socketTest/obj/Release/socketTest.pdb