Prechádzať zdrojové kódy

初始化微调,增加关于我们窗体

yc_t 6 rokov pred
rodič
commit
749ca72cc8
25 zmenil súbory, kde vykonal 513 pridanie a 184 odobranie
  1. 2 2
      PLCLinker/centralController/App.config
  2. 101 0
      PLCLinker/centralController/FormAboutUs.Designer.cs
  3. 26 0
      PLCLinker/centralController/FormAboutUs.cs
  4. 120 0
      PLCLinker/centralController/FormAboutUs.resx
  5. 136 132
      PLCLinker/centralController/FormCentralController.Designer.cs
  6. 21 1
      PLCLinker/centralController/FormCentralController.cs
  7. 3 0
      PLCLinker/centralController/FormSysConfig.Designer.cs
  8. 15 0
      PLCLinker/centralController/FormSysConfig.cs
  9. 3 0
      PLCLinker/centralController/FormSysInfo.Designer.cs
  10. 11 3
      PLCLinker/centralController/Monitor/Monitor.cs
  11. 5 4
      PLCLinker/centralController/Monitor/SystemInitializer.cs
  12. 10 0
      PLCLinker/centralController/Properties/Resources.Designer.cs
  13. 13 10
      PLCLinker/centralController/Properties/Resources.resx
  14. 0 1
      PLCLinker/centralController/Terminal/TerminalSimul.cs
  15. 30 25
      PLCLinker/centralController/WebServer/WebServer.cs
  16. 10 0
      PLCLinker/centralController/centralController.csproj
  17. 2 2
      PLCLinker/centralController/language/Language.cs
  18. BIN
      PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferences.cache
  19. BIN
      PLCLinker/centralController/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
  20. BIN
      PLCLinker/centralController/obj/Release/centralController.Properties.Resources.resources
  21. 1 1
      PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache
  22. 1 0
      PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt
  23. BIN
      PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache
  24. BIN
      PLCLinker/centralController/sdk/dotNetty/nettyCommunication.dll
  25. 3 3
      PLCLinker/centralController/serversettings.json

+ 2 - 2
PLCLinker/centralController/App.config

@@ -9,8 +9,8 @@
     <!--数据库信息-->
     <!--<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=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="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=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
     <add key="DBtimeout" value="3"/>
     <!--号牌机信息-->

+ 101 - 0
PLCLinker/centralController/FormAboutUs.Designer.cs

@@ -0,0 +1,101 @@
+namespace centralController
+{
+    partial class FormAboutUs
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.lbx_aboutUs = new DevComponents.DotNetBar.LabelX();
+            this.btnx_close = new DevComponents.DotNetBar.ButtonX();
+            this.pb_icon = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pb_icon)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // lbx_aboutUs
+            // 
+            this.lbx_aboutUs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
+            this.lbx_aboutUs.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            // 
+            // 
+            // 
+            this.lbx_aboutUs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_aboutUs.ForeColor = System.Drawing.Color.Black;
+            this.lbx_aboutUs.Location = new System.Drawing.Point(-10, 146);
+            this.lbx_aboutUs.Name = "lbx_aboutUs";
+            this.lbx_aboutUs.Size = new System.Drawing.Size(350, 135);
+            this.lbx_aboutUs.TabIndex = 3;
+            this.lbx_aboutUs.Text = "sample";
+            this.lbx_aboutUs.TextAlignment = System.Drawing.StringAlignment.Center;
+            this.lbx_aboutUs.TextLineAlignment = System.Drawing.StringAlignment.Near;
+            // 
+            // btnx_close
+            // 
+            this.btnx_close.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnx_close.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnx_close.Location = new System.Drawing.Point(127, 298);
+            this.btnx_close.Name = "btnx_close";
+            this.btnx_close.Size = new System.Drawing.Size(75, 23);
+            this.btnx_close.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
+            this.btnx_close.TabIndex = 2;
+            this.btnx_close.Text = "关闭";
+            this.btnx_close.Click += new System.EventHandler(this.btnx_close_Click);
+            // 
+            // pb_icon
+            // 
+            this.pb_icon.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.pb_icon.BackgroundImage = global::centralController.Properties.Resources.icon;
+            this.pb_icon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pb_icon.Location = new System.Drawing.Point(103, 12);
+            this.pb_icon.Name = "pb_icon";
+            this.pb_icon.Size = new System.Drawing.Size(129, 128);
+            this.pb_icon.TabIndex = 4;
+            this.pb_icon.TabStop = false;
+            // 
+            // FormAboutUs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.ClientSize = new System.Drawing.Size(330, 334);
+            this.Controls.Add(this.pb_icon);
+            this.Controls.Add(this.lbx_aboutUs);
+            this.Controls.Add(this.btnx_close);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Name = "FormAboutUs";
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "关于我们";
+            ((System.ComponentModel.ISupportInitialize)(this.pb_icon)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private DevComponents.DotNetBar.LabelX lbx_aboutUs;
+        private DevComponents.DotNetBar.ButtonX btnx_close;
+        private System.Windows.Forms.PictureBox pb_icon;
+    }
+}

+ 26 - 0
PLCLinker/centralController/FormAboutUs.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace centralController
+{
+    public partial class FormAboutUs : Form
+    {
+        public FormAboutUs(string info)
+        {
+            InitializeComponent();
+            lbx_aboutUs.Text = info;
+        }
+
+        private void btnx_close_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+    }
+}

+ 120 - 0
PLCLinker/centralController/FormAboutUs.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 136 - 132
PLCLinker/centralController/FormCentralController.Designer.cs

@@ -35,6 +35,14 @@
             this.dockSite4 = new DevComponents.DotNetBar.DockSite();
             this.dockSite_mainView = new DevComponents.DotNetBar.DockSite();
             this.bar_mainWin = new DevComponents.DotNetBar.Bar();
+            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.testPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.button3 = new System.Windows.Forms.Button();
             this.groupPanel2 = new DevComponents.DotNetBar.Controls.GroupPanel();
@@ -54,14 +62,6 @@
             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();
@@ -143,6 +143,9 @@
             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.testPanel.SuspendLayout();
             this.groupPanel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -153,9 +156,6 @@
             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();
@@ -244,8 +244,8 @@
             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.testPanel);
+            this.bar_mainWin.Controls.Add(this.ParkingSpaceMonitorPanel);
             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;
@@ -267,6 +267,123 @@
             this.bar_mainWin.TabNavigation = true;
             this.bar_mainWin.TabStop = false;
             // 
+            // 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, 384);
+            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, 384);
+            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, 384);
+            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;
+            // 
             // testPanel
             // 
             this.testPanel.Controls.Add(this.button3);
@@ -551,123 +668,6 @@
             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, 384);
-            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, 384);
-            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, 384);
-            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;
@@ -691,6 +691,7 @@
             this.dci_Test.Control = this.testPanel;
             this.dci_Test.Name = "dci_Test";
             this.dci_Test.Text = "测试";
+            this.dci_Test.Visible = false;
             // 
             // dci_devStatus
             // 
@@ -1248,6 +1249,7 @@
             // 
             this.btn_about.Name = "btn_about";
             this.btn_about.Text = "关于我们";
+            this.btn_about.Click += new System.EventHandler(this.btn_about_Click);
             // 
             // bar_shortcut
             // 
@@ -1320,6 +1322,7 @@
             // shortcut_logout
             // 
             this.shortcut_logout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+            this.shortcut_logout.Enabled = false;
             this.shortcut_logout.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.shortcut_logout.Image = global::centralController.Properties.Resources.monitor;
             this.shortcut_logout.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
@@ -1358,6 +1361,7 @@
             this.shortcut_about.Name = "shortcut_about";
             this.shortcut_about.ShowSubItems = false;
             this.shortcut_about.Text = "关于我们";
+            this.shortcut_about.Click += new System.EventHandler(this.shortcut_about_Click);
             // 
             // shortcut_close
             // 
@@ -1509,6 +1513,9 @@
             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.testPanel.ResumeLayout(false);
             this.testPanel.PerformLayout();
             this.groupPanel2.ResumeLayout(false);
@@ -1520,9 +1527,6 @@
             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);

+ 21 - 1
PLCLinker/centralController/FormCentralController.cs

@@ -595,7 +595,7 @@ namespace centralController
                         rtb_notification.SelectionColor = Color.Red;
                         break;
                 }
-                //rtb_notification.Select(index + appendingText.Length - 1, 0);
+                rtb_notification.Select(index + appendingText.Length - 1, 0);
                 if (!rtb_notification.Focused)
                     rtb_notification.ScrollToCaret();
             }
@@ -776,6 +776,16 @@ namespace centralController
             FormSysInfo sysInfo = new FormSysInfo(Monitor.Monitor.GetSysInfo());
             sysInfo.ShowDialog();
         }
+        /// <summary>
+        /// 关于我们信息
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btn_about_Click(object sender, EventArgs e)
+        {
+            FormAboutUs aboutUs = new FormAboutUs(Monitor.Monitor.GetAboutInfo());
+            aboutUs.ShowDialog();
+        }
         #endregion
 
         #region 快捷菜单栏
@@ -834,6 +844,16 @@ namespace centralController
                 });
             }
         }
+        /// <summary>
+        /// 关于我们信息框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void shortcut_about_Click(object sender, EventArgs e)
+        {
+            FormAboutUs aboutUs = new FormAboutUs(Monitor.Monitor.GetAboutInfo());
+            aboutUs.ShowDialog();
+        }
         #endregion
     }
 }

+ 3 - 0
PLCLinker/centralController/FormSysConfig.Designer.cs

@@ -353,6 +353,7 @@ namespace centralController
             this.btnx_alterLogAddress.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnx_alterLogAddress.TabIndex = 8;
             this.btnx_alterLogAddress.Text = "修改日志路径";
+            this.btnx_alterLogAddress.Click += new System.EventHandler(this.btnx_alterLogAddress_Click);
             // 
             // lbx_advertAddress
             // 
@@ -390,6 +391,7 @@ namespace centralController
             this.btnx_alterDefaultLic.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnx_alterDefaultLic.TabIndex = 5;
             this.btnx_alterDefaultLic.Text = "修改默认车牌";
+            this.btnx_alterDefaultLic.Click += new System.EventHandler(this.btnx_alterDefaultLic_Click);
             // 
             // tb_defaultLic
             // 
@@ -408,6 +410,7 @@ namespace centralController
             this.btnx_alterGarageId.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnx_alterGarageId.TabIndex = 2;
             this.btnx_alterGarageId.Text = "修改车库号";
+            this.btnx_alterGarageId.Click += new System.EventHandler(this.btnx_alterGarageId_Click);
             // 
             // tb_garageID
             // 

+ 15 - 0
PLCLinker/centralController/FormSysConfig.cs

@@ -116,5 +116,20 @@ namespace centralController
         {
             sld_nmfilterRatio.Text = "ºÅÅÆÉ¸Ñ¡±ÈÀý:" +(sld_nmfilterRatio.Value/10*10)/100.0;
         }
+
+        private void btnx_alterLogAddress_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void btnx_alterGarageId_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void btnx_alterDefaultLic_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

+ 3 - 0
PLCLinker/centralController/FormSysInfo.Designer.cs

@@ -51,6 +51,7 @@
             // btnx_close
             // 
             this.btnx_close.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnx_close.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
             this.btnx_close.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnx_close.Location = new System.Drawing.Point(119, 286);
             this.btnx_close.Name = "btnx_close";
@@ -70,7 +71,9 @@
             this.ClientSize = new System.Drawing.Size(309, 315);
             this.Controls.Add(this.lbx_sysInfo);
             this.Controls.Add(this.btnx_close);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Name = "FormSysInfo";
+            this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "系统信息";
             this.ResumeLayout(false);

+ 11 - 3
PLCLinker/centralController/Monitor/Monitor.cs

@@ -118,8 +118,8 @@ namespace Monitor
                     count = 0;
                     updateCount = false;
                 }
-                if (count > 10000)
-                    count = 11;
+                if (count > 1000)
+                    count = 3;
                 count++;
                 if (PLC != null)
                 {
@@ -171,7 +171,7 @@ namespace Monitor
                             }
                             catch (Exception ex) { Console.WriteLine("PLC监控中控数据," + ex.Message); }
                             //最后获得所有车位信息
-                            if (count < 10)
+                            if (count < 10 && count % 3 == 0)
                             {
                                 try
                                 {
@@ -418,6 +418,14 @@ namespace Monitor
             return info;
         }
         /// <summary>
+        /// 返回关于我们信息字符串
+        /// </summary>
+        /// <returns></returns>
+        public static string GetAboutInfo()
+        {
+            return Language.ins.aboutWinText;
+        }
+        /// <summary>
         /// 返回停车记录信息
         /// </summary>
         /// <returns></returns>

+ 5 - 4
PLCLinker/centralController/Monitor/SystemInitializer.cs

@@ -81,23 +81,24 @@ namespace Monitor
             Monitor.localDBOper = new DBOperation(localDBConnStr, DBtimeout);
             Monitor.SetNotification("初始化云端数据库...", parkMonitor.model.TextColor.Log);
             initStatus = initStatus && Monitor.remoteDBOper.InitConnPooling(5);
+            if (!initStatus) { Monitor.SetNotification("云端数据库初始化异常", parkMonitor.model.TextColor.Error); return; }
             Monitor.SetNotification("初始化本地数据库...", parkMonitor.model.TextColor.Log);
             initStatus = initStatus && Monitor.localDBOper.InitConnPooling(5);
             //数据库初始化结束,进入状态3
-            if (!initStatus) { return; }
+            if (!initStatus) { Monitor.SetNotification("本地数据库初始化异常", parkMonitor.model.TextColor.Error); return; }
             else { Monitor.initializeState = 3; }
 
             //初始化凭证号
             initStatus = initStatus && Credence.ReadCredence();
-            if (!initStatus) { return; }
+            if (!initStatus) { Monitor.SetNotification("凭证初始化异常", parkMonitor.model.TextColor.Error); return; }
 
             //初始化web对象
-            Monitor.SetNotification("初始化云端连接...", parkMonitor.model.TextColor.Log);
+            Monitor.SetNotification("初始化web模块...", parkMonitor.model.TextColor.Log);
             //Monitor.webServer = new CentralForWeb();
             Monitor.webServer = new MyWebServer();
             initStatus = initStatus && Monitor.webServer.Start(Monitor.webPort);
             //webServer初始化结束,进入状态4
-            if (!initStatus) { return; }
+            if (!initStatus) { Monitor.SetNotification("Web模块初始化异常", parkMonitor.model.TextColor.Error); return; }
             else { Monitor.initializeState = 4; }
 
             #region 测试数据库操作

+ 10 - 0
PLCLinker/centralController/Properties/Resources.Designer.cs

@@ -110,6 +110,16 @@ namespace centralController.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap icon {
+            get {
+                object obj = ResourceManager.GetObject("icon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

+ 13 - 10
PLCLinker/centralController/Properties/Resources.resx

@@ -118,12 +118,15 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resource\image\menu\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="car" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resource\image\map\car.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sysExplain" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\menu\sysExplain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="circulate2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resource\image\map\circulate2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\map\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -133,22 +136,22 @@
   <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\menu\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resource\image\map\pc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="sysExplain1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\menu\sysExplain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resource\image\menu\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="openFile" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\menu\openFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pc" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resource\image\map\pc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="circulate2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resource\image\map\circulate2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="numMachine" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\map\numMachine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="car" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resource\image\map\car.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resource\image\icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

+ 0 - 1
PLCLinker/centralController/Terminal/TerminalSimul.cs

@@ -18,7 +18,6 @@ namespace Terminal
         /// </summary>
         public static bool ParkTermOper(int id, string carInfo)
         {
-
             int countdown = 10;
             int index = -1;
             for (int i = 0; i < Terminal.terminalInfo.Count; i++)

+ 30 - 25
PLCLinker/centralController/WebServer/WebServer.cs

@@ -253,16 +253,15 @@ namespace centralController.WebServer
                 {
                     //预约停
                     case "RESERVE":
-                        if (msg.sender != "" && msg.bookTime != "" && msg.bookLength != 0)
+                        if (msg.userID != "" && msg.bookTime != "" && msg.bookLength != 0)
                         {
                             if (!ReservationValidate(msg))
                             {
                                 //回复预约失败给web
                                 returnMsg.cmd = "RESERVEFAILED";
-                                returnMsg.garageID = Monitor.Monitor.garageID;
+                                returnMsg.userID = msg.userID;
                                 returnMsg.context = msg.context;
                                 returnMsg.garageID = ClientSettings.GarageID;
-                                returnMsg.sender = IPaddressTools.GetLocalIP();
                                 comm.SendMessage(returnMsg);
                                 Monitor.Monitor.SetNotification("车辆" + msg.context + "预约停车,已无可预约车位", parkMonitor.model.TextColor.Warning);
                             }
@@ -274,16 +273,15 @@ namespace centralController.WebServer
                                     waitToReserveQueue.Enqueue(msg);
                                 }
                                 //预约记录与车辆状态写入数据库
-                                DBOperResult = DBOperResult && ReserveDBOperation(true, msg.sender, true, msg.context, msg.bookTime, msg.bookLength);
-                                DBOperResult = DBOperResult && ReserveDBOperation(false, msg.sender, true, msg.context, msg.bookTime, msg.bookLength);
+                                DBOperResult = DBOperResult && ReserveDBOperation(true, msg.userID, true, msg.context, msg.bookTime, msg.bookLength);
+                                DBOperResult = DBOperResult && ReserveDBOperation(false, msg.userID, true, msg.context, msg.bookTime, msg.bookLength);
                                 //回复成功给web
                                 if (!DBOperResult)
                                     Log.WriteLog(LogType.process, LogFile.WARNING, msg.context + "从" + msg.bookTime + "开始预约" + msg.bookLength + "小时,预约指令数据库操作未获得记录ID");
                                 returnMsg.cmd = "RESERVEOK";
-                                returnMsg.garageID = Monitor.Monitor.garageID;
+                                returnMsg.userID = msg.userID;
                                 returnMsg.context = msg.context;
                                 returnMsg.garageID = ClientSettings.GarageID;
-                                returnMsg.sender = IPaddressTools.GetLocalIP();
                                 comm.SendMessage(returnMsg);
                                 Monitor.Monitor.SetNotification("车辆" + msg.context + "预约停车,操作成功", parkMonitor.model.TextColor.Log);
                             }
@@ -307,7 +305,7 @@ namespace centralController.WebServer
                             int countdown = 2;
                             bool success = true;
                             //根据号牌寻找对应号牌机编号,找不到则返回失败信息
-                            if (msg.context != "" && msg.sender != "")
+                            if (msg.context != "" && msg.userID != "")
                             {
                                 while (id == 0 && countdown-- > 0)
                                 {
@@ -339,9 +337,9 @@ namespace centralController.WebServer
                                 returnMsg.cmd = "PARKFAILED";
                                 Monitor.Monitor.SetNotification("未识别到车辆" + msg.context.Split('.')[2] + "停放位置,请确认车辆已入场", parkMonitor.model.TextColor.Warning);
                             }
+                            returnMsg.userID = msg.userID;
                             returnMsg.garageID = Monitor.Monitor.garageID;
                             returnMsg.context = msg.context;
-                            returnMsg.sender = IPaddressTools.GetLocalIP();
                             comm.SendMessage(returnMsg);
                         }
                         break;
@@ -362,9 +360,9 @@ namespace centralController.WebServer
                                 returnMsg.cmd = "FETCHFAILED";
                                 Monitor.Monitor.SetNotification("凭证号" + msg.context + "异常,无法解析", parkMonitor.model.TextColor.Warning);
                             }
+                            returnMsg.userID = msg.userID;
                             returnMsg.garageID = Monitor.Monitor.garageID;
                             returnMsg.context = msg.context;
-                            returnMsg.sender = IPaddressTools.GetLocalIP();
                             comm.SendMessage(returnMsg);
                         }
                         break;
@@ -573,7 +571,7 @@ namespace centralController.WebServer
                 catch (Exception)
                 {
                     connected = false;
-                    Console.WriteLine("服务没有开启,请检查服务器");
+                    Console.WriteLine("初始web服务连接异常");
                 }
                 Connect();
             });
@@ -597,6 +595,7 @@ namespace centralController.WebServer
                             }
                             //Monitor.Monitor.SetNotification(msg.context);
                         }
+                        Thread.Sleep(200);
                     }
                     catch { Console.WriteLine("线程已中断"); }
                 }
@@ -615,7 +614,11 @@ namespace centralController.WebServer
         public void Stop()
         {
             isClosing = true;
-            Connections.close();
+            try
+            {
+                Connections.close();
+            }
+            catch { }
             //throw new NotImplementedException();
         }
         /// <summary>
@@ -669,6 +672,7 @@ namespace centralController.WebServer
                 {
                     //if (receiveMsg != null)
                     //    Console.WriteLine(Connections.isAlive() + ", " + receiveMsg.ThreadState.ToString());
+                    Console.WriteLine(Connections.isAlive()+","+count+","+connected);
                     if (Connections.isAlive())
                     {
                         if (!connected)
@@ -682,7 +686,7 @@ namespace centralController.WebServer
                         {
                             try
                             {
-                                receiveMsg.Start();
+                               receiveMsg.Start();
                             }
                             catch (Exception ex) { Console.WriteLine(ex.Message); }
                         }
@@ -693,16 +697,25 @@ namespace centralController.WebServer
                             Monitor.Monitor.SetNotification("web连接已断开", parkMonitor.model.TextColor.Warning);
                         else if (count == 0)
                         {
-                            Connections.close();
+                            try
+                            {
+                                Connections.close();
+                                //comm = null;
+                            }
+                            catch (Exception ex) { Console.WriteLine("网络异常,停止尝试"); }
                             break;
                         }
+                        else if(connected){
+                            try { Connections.close(); }
+                            catch (Exception) { Console.WriteLine("服务没有开启,请检查服务器"); }
+                        }
                         connected = false;
                         count--;
                         try
                         {
                             if (receiveMsg != null && receiveMsg.ThreadState == ThreadState.WaitSleepJoin)
                             {
-                                receiveMsg.Interrupt();
+                               receiveMsg.Interrupt();
                             }
                         }
                         catch (Exception ex)
@@ -710,15 +723,7 @@ namespace centralController.WebServer
                             Monitor.Monitor.SetNotification("连接断开,终止消息接收线程", parkMonitor.model.TextColor.Log);
                         }
                         Console.WriteLine(" 连接关闭,需要重新连接注册");
-                        try
-                        {
-                            Connections.close();
-                            Connections.Connection();
-                        }
-                        catch (Exception)
-                        {
-                            Console.WriteLine("服务没有开启,请检查服务器");
-                        }
+                        try { Connections.Connection(); } catch { Console.WriteLine("尝试连接异常"); }
                     }
                     Thread.Sleep(1000);
                 }
@@ -739,7 +744,7 @@ namespace centralController.WebServer
         /// <returns></returns>
         public bool GetConnectStatus()
         {
-            return connected;
+            return Connections.isAlive();
         }
     }
 }

+ 10 - 0
PLCLinker/centralController/centralController.csproj

@@ -172,6 +172,12 @@
     <Compile Include="allInOneMachine\broadcastModule.cs" />
     <Compile Include="entity\AbstractMessage.cs" />
     <Compile Include="entity\Jsonhelper.cs" />
+    <Compile Include="FormAboutUs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormAboutUs.Designer.cs">
+      <DependentUpon>FormAboutUs.cs</DependentUpon>
+    </Compile>
     <Compile Include="FormModbus\BaseConfig_From.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -282,6 +288,9 @@
     <Compile Include="WebServer\LazySingleton.cs" />
     <Compile Include="WebServer\MultiSocketThread.cs" />
     <Compile Include="WebServer\WebServer.cs" />
+    <EmbeddedResource Include="FormAboutUs.resx">
+      <DependentUpon>FormAboutUs.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FormModbus\BaseConfig_From.resx">
       <DependentUpon>BaseConfig_From.cs</DependentUpon>
     </EmbeddedResource>
@@ -364,6 +373,7 @@
     <None Include="resource\image\map\numMachine.png" />
     <None Include="resource\image\map\car.png" />
     <Content Include="icon.ico" />
+    <None Include="resource\image\icon.png" />
     <Content Include="sdk\broadcast\broadcastDLL.dll" />
     <Content Include="sdk\log4net\log4net.dll" />
     <Content Include="sdk\mysql\MySql.Data.dll" />

+ 2 - 2
PLCLinker/centralController/language/Language.cs

@@ -131,9 +131,9 @@ namespace parkMonitor.language {
 
 			mapLng["aboutWinText"] = @"智能泊车系统 中控端
 
-武汉大学
+武汉智象机器人有限公司
 
-CopyRight(C) 2013 - 2018
+CopyRight(C) 2014 - 2019
 保留所有权利";
 
 		}

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


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


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


+ 1 - 1
PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-781f2faa9b6b2cdcfc3b3cc73acca478a36eb491
+e54dca5ae57e19841adc9305edf5acb99320d11d

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

@@ -262,3 +262,4 @@ E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonit
 E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe
 E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.pdb
 E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojResolveAssemblyReference.cache
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.FormAboutUs.resources

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


BIN
PLCLinker/centralController/sdk/dotNetty/nettyCommunication.dll


+ 3 - 3
PLCLinker/centralController/serversettings.json

@@ -4,7 +4,7 @@
   "garageID": "1",
   "port": "9000",
   "size": "1024",
-  "readerIdleTime": "60",
-  "writerIdleTime": "30",
-  "allIdleTime": "90"
+  "readerIdleTime": "10",
+  "writerIdleTime": "6",
+  "allIdleTime": "19"
 }