Half Package Problem.

DotNettyFrom/DotNettyFrom.csproj

@@ -144,6 +144,13 @@
     <Compile Include="dialog\HistoryDialog.Designer.cs">
       <DependentUpon>HistoryDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="dialog\TcpPkgConfigDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dialog\TcpPkgConfigDialog.Designer.cs">
+      <DependentUpon>TcpPkgConfigDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="generatecmd\DtuCmdGenetor.cs" />
     <Compile Include="excel\ExcelHelper.cs" />
     <Compile Include="form\ItemEditorForm.cs">
       <SubType>Form</SubType>
@@ -158,6 +165,7 @@
       <DependentUpon>ItemManagerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="generatecmd\CmdGenetor.cs" />
+    <Compile Include="generatecmd\Water2CmdGenetor.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -178,6 +186,9 @@
     <EmbeddedResource Include="dialog\HistoryDialog.resx">
       <DependentUpon>HistoryDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dialog\TcpPkgConfigDialog.resx">
+      <DependentUpon>TcpPkgConfigDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="form\ItemEditorForm.resx">
       <DependentUpon>ItemEditorForm.cs</DependentUpon>
     </EmbeddedResource>

DotNettyFrom/MainForm.Designer.cs

@@ -46,7 +46,10 @@
             this.BtnSendData = new System.Windows.Forms.Button();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.文件FToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.dtuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.water2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.时间TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.RT_HB_Enable = new System.Windows.Forms.ToolStripMenuItem();
             this.RT_HB_Time = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.历史HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -70,6 +73,8 @@
             this.TbDeviceId = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
+            this.配置CToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.HalfPkgToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ListBoxLogContextMenu.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
@@ -222,7 +227,8 @@
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.文件FToolStripMenuItem,
             this.时间TToolStripMenuItem,
-            this.历史HToolStripMenuItem});
+            this.历史HToolStripMenuItem,
+            this.配置CToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
             this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 3, 0, 3);
@@ -232,30 +238,58 @@
             // 
             // 文件FToolStripMenuItem
             // 
+            this.文件FToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.dtuToolStripMenuItem,
+            this.water2ToolStripMenuItem});
             this.文件FToolStripMenuItem.Name = "文件FToolStripMenuItem";
             this.文件FToolStripMenuItem.Size = new System.Drawing.Size(58, 21);
             this.文件FToolStripMenuItem.Text = "文件(&F)";
             // 
+            // dtuToolStripMenuItem
+            // 
+            this.dtuToolStripMenuItem.Name = "dtuToolStripMenuItem";
+            this.dtuToolStripMenuItem.Size = new System.Drawing.Size(115, 22);
+            this.dtuToolStripMenuItem.Text = "dtu";
+            this.dtuToolStripMenuItem.Click += new System.EventHandler(this.dtuToolStripMenuItem_Click);
+            // 
+            // water2ToolStripMenuItem
+            // 
+            this.water2ToolStripMenuItem.Name = "water2ToolStripMenuItem";
+            this.water2ToolStripMenuItem.Size = new System.Drawing.Size(115, 22);
+            this.water2ToolStripMenuItem.Text = "water2";
+            this.water2ToolStripMenuItem.Click += new System.EventHandler(this.water2ToolStripMenuItem_Click);
+            // 
             // 时间TToolStripMenuItem
             // 
             this.时间TToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.RT_HB_Enable,
             this.RT_HB_Time,
             this.toolStripSeparator1});
             this.时间TToolStripMenuItem.Name = "时间TToolStripMenuItem";
             this.时间TToolStripMenuItem.Size = new System.Drawing.Size(59, 21);
             this.时间TToolStripMenuItem.Text = "时间(&T)";
             // 
+            // RT_HB_Enable
+            // 
+            this.RT_HB_Enable.Checked = true;
+            this.RT_HB_Enable.CheckOnClick = true;
+            this.RT_HB_Enable.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.RT_HB_Enable.Name = "RT_HB_Enable";
+            this.RT_HB_Enable.Size = new System.Drawing.Size(152, 22);
+            this.RT_HB_Enable.Text = "启用心跳";
+            this.RT_HB_Enable.Click += new System.EventHandler(this.RT_HB_Enable_Click);
+            // 
             // RT_HB_Time
             // 
             this.RT_HB_Time.Name = "RT_HB_Time";
-            this.RT_HB_Time.Size = new System.Drawing.Size(141, 22);
+            this.RT_HB_Time.Size = new System.Drawing.Size(152, 22);
             this.RT_HB_Time.Text = "心跳超时(&H)";
             this.RT_HB_Time.Click += new System.EventHandler(this.RT_HB_Time_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(138, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
             // 
             // 历史HToolStripMenuItem
             // 
@@ -272,33 +306,33 @@
             // RT_HI_Host
             // 
             this.RT_HI_Host.Name = "RT_HI_Host";
-            this.RT_HI_Host.Size = new System.Drawing.Size(152, 22);
+            this.RT_HI_Host.Size = new System.Drawing.Size(124, 22);
             this.RT_HI_Host.Text = "Host";
             this.RT_HI_Host.Click += new System.EventHandler(this.RT_HI_Host_Click);
             // 
             // RT_HI_DeviceId
             // 
             this.RT_HI_DeviceId.Name = "RT_HI_DeviceId";
-            this.RT_HI_DeviceId.Size = new System.Drawing.Size(152, 22);
+            this.RT_HI_DeviceId.Size = new System.Drawing.Size(124, 22);
             this.RT_HI_DeviceId.Text = "地址";
             this.RT_HI_DeviceId.Click += new System.EventHandler(this.RT_HI_DeviceId_Click);
             // 
             // RT_HI_CCID
             // 
             this.RT_HI_CCID.Name = "RT_HI_CCID";
-            this.RT_HI_CCID.Size = new System.Drawing.Size(152, 22);
+            this.RT_HI_CCID.Size = new System.Drawing.Size(124, 22);
             this.RT_HI_CCID.Text = "CCID";
             this.RT_HI_CCID.Click += new System.EventHandler(this.RT_HI_CCID_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(121, 6);
             // 
             // RT_HI_SendData
             // 
             this.RT_HI_SendData.Name = "RT_HI_SendData";
-            this.RT_HI_SendData.Size = new System.Drawing.Size(152, 22);
+            this.RT_HI_SendData.Size = new System.Drawing.Size(124, 22);
             this.RT_HI_SendData.Text = "发送数据";
             this.RT_HI_SendData.Click += new System.EventHandler(this.RT_HI_SendData_Click);
             // 
@@ -462,6 +496,21 @@
             this.label1.TabIndex = 2;
             this.label1.Text = "Host";
             // 
+            // 配置CToolStripMenuItem
+            // 
+            this.配置CToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.HalfPkgToolStripMenuItem});
+            this.配置CToolStripMenuItem.Name = "配置CToolStripMenuItem";
+            this.配置CToolStripMenuItem.Size = new System.Drawing.Size(60, 21);
+            this.配置CToolStripMenuItem.Text = "配置(&C)";
+            // 
+            // HalfPkgToolStripMenuItem
+            // 
+            this.HalfPkgToolStripMenuItem.Name = "HalfPkgToolStripMenuItem";
+            this.HalfPkgToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.HalfPkgToolStripMenuItem.Text = "半包-粘包";
+            this.HalfPkgToolStripMenuItem.Click += new System.EventHandler(this.HalfPkgToolStripMenuItem_Click);
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F);
@@ -534,6 +583,11 @@
         private System.Windows.Forms.ToolStripMenuItem LB_Context_ClearAll;
         private System.Windows.Forms.ToolStripMenuItem LB_Context_CpLine;
         private System.Windows.Forms.Button BtnClearAll;
+        private System.Windows.Forms.ToolStripMenuItem RT_HB_Enable;
+        private System.Windows.Forms.ToolStripMenuItem dtuToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem water2ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 配置CToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem HalfPkgToolStripMenuItem;
     }
 }
 

DotNettyFrom/MainForm.cs

@@ -130,6 +130,15 @@ namespace DotNettyFrom
             StatusItemHbTime.Text = "R:" + SystemConfig.ReaderIdleTimeSeconds + "/s,W:" +
                                     SystemConfig.WriterIdleTimeSeconds + "/s,A:" + SystemConfig.AllIdleTimeSeconds +
                                     "/s";
+            CmdGenetor.Genetor = new DtuCmdGenetor();
+            if ("".Equals(TbDeviceId.Text.Trim()))
+            {
+                CmdGenetor.Genetor.DeviceId = "000000000001";
+            }
+            else
+            {
+                CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
+            }
         }
 
         #region Component Event
@@ -151,6 +160,7 @@ namespace DotNettyFrom
 
             BeforeConnection();
 
+            CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
             Task startNew = Task.Factory.StartNew(() =>
             {
                 _nettyClient = new NettyClient();
@@ -164,8 +174,8 @@ namespace DotNettyFrom
 
             Task startNew = Task.Factory.StartNew(() =>
             {
-                string loginCmd = CmdGenetor.GetInstance().SetDeviceId(TbDeviceId.Text.Trim())
-                    .GetLoginCmd(TbCCID.Text.Trim());
+                CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
+                string loginCmd = CmdGenetor.Genetor.GetLoginCmd(TbCCID.Text.Trim());
                 _nettyClient = new NettyClient();
                 _nettyClient.StartNetty(host, port, loginCmd);
             });
@@ -190,6 +200,11 @@ namespace DotNettyFrom
             hbt.ShowDialog();
         }
 
+        private void RT_HB_Enable_Click(object sender, EventArgs e)
+        {
+            SystemConfig.OpenHeartBeat = RT_HB_Enable.Checked;
+        }
+
         private void TbPort_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (e.KeyChar != 8 && !Char.IsDigit(e.KeyChar))
@@ -198,6 +213,16 @@ namespace DotNettyFrom
             }
         }
 
+        private void dtuToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            CmdGenetor.Genetor = new DtuCmdGenetor();
+        }
+
+        private void water2ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            CmdGenetor.Genetor = new Water2CmdGenetor();
+        }
+
         private void BtnClearAll_Click(object sender, EventArgs e) => LBLogShow.Items.Clear();
 
         private void BtnCmdManager_Click(object sender, EventArgs e)
@@ -239,6 +264,12 @@ namespace DotNettyFrom
         {
         }
 
+        private void HalfPkgToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TcpPkgConfigDialog tcpDialog = new TcpPkgConfigDialog();
+            tcpDialog.ShowDialog();
+        }
+
         #endregion
 
         #region ListBox

DotNettyFrom/config/SystemConfig.cs

@@ -11,6 +11,9 @@ namespace DotNettyFrom.config
         public static int FunctionCodeStartPos = 18;
         public static int FunctionCodeLength = 2;
 
+
+        public static bool OpenHeartBeat = true;
+
         public static int ReaderIdleTimeSeconds = 5;
         public static int WriterIdleTimeSeconds = 5;
         public static int AllIdleTimeSeconds = 25;
@@ -26,6 +29,7 @@ namespace DotNettyFrom.config
 
         //1 发送的. 0:接收的, -1.Debug.日常信息
         public static int SendType = 1;
+
         public static int RecType = 0;
         public static int DebugType = -1;
         public static int ReplyType = 2;
@@ -35,6 +39,5 @@ namespace DotNettyFrom.config
         public const int AddrHisType = 2;
         public const int SendHisType = 3;
         public const int CcidHisType = 4;
-
     }
 }

DotNettyFrom/dialog/TcpPkgConfigDialog.Designer.cs

@@ -0,0 +1,193 @@
+namespace DotNettyFrom.dialog
+{
+    partial class TcpPkgConfigDialog
+    {
+        /// <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.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.LengthFieldOffset = new System.Windows.Forms.NumericUpDown();
+            this.LengthFieldLength = new System.Windows.Forms.NumericUpDown();
+            this.LengthAdjustment = new System.Windows.Forms.NumericUpDown();
+            this.buttonCancle = new System.Windows.Forms.Button();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.InitialBytesToStrip = new System.Windows.Forms.NumericUpDown();
+            this.label4 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.LengthFieldOffset)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LengthFieldLength)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LengthAdjustment)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.InitialBytesToStrip)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(89, 124);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(109, 17);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "LengthFieldOffset";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(89, 188);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(117, 17);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "LengthFieldLength ";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(89, 241);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(112, 17);
+            this.label3.TabIndex = 1;
+            this.label3.Text = "LengthAdjustment";
+            // 
+            // LengthFieldOffset
+            // 
+            this.LengthFieldOffset.Location = new System.Drawing.Point(210, 124);
+            this.LengthFieldOffset.Name = "LengthFieldOffset";
+            this.LengthFieldOffset.Size = new System.Drawing.Size(120, 23);
+            this.LengthFieldOffset.TabIndex = 2;
+            // 
+            // LengthFieldLength
+            // 
+            this.LengthFieldLength.Location = new System.Drawing.Point(210, 186);
+            this.LengthFieldLength.Name = "LengthFieldLength";
+            this.LengthFieldLength.Size = new System.Drawing.Size(120, 23);
+            this.LengthFieldLength.TabIndex = 2;
+            // 
+            // LengthAdjustment
+            // 
+            this.LengthAdjustment.Location = new System.Drawing.Point(210, 235);
+            this.LengthAdjustment.Name = "LengthAdjustment";
+            this.LengthAdjustment.Size = new System.Drawing.Size(120, 23);
+            this.LengthAdjustment.TabIndex = 2;
+            // 
+            // buttonCancle
+            // 
+            this.buttonCancle.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancle.Location = new System.Drawing.Point(92, 345);
+            this.buttonCancle.Name = "buttonCancle";
+            this.buttonCancle.Size = new System.Drawing.Size(75, 23);
+            this.buttonCancle.TabIndex = 3;
+            this.buttonCancle.Text = "取消";
+            this.buttonCancle.UseVisualStyleBackColor = true;
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(255, 345);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(75, 23);
+            this.buttonOk.TabIndex = 3;
+            this.buttonOk.Text = "确定";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(80, 419);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.ReadOnly = true;
+            this.textBox1.Size = new System.Drawing.Size(264, 23);
+            this.textBox1.TabIndex = 4;
+            this.textBox1.Text = "下次连接生效";
+            this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // InitialBytesToStrip
+            // 
+            this.InitialBytesToStrip.Location = new System.Drawing.Point(210, 296);
+            this.InitialBytesToStrip.Name = "InitialBytesToStrip";
+            this.InitialBytesToStrip.Size = new System.Drawing.Size(120, 23);
+            this.InitialBytesToStrip.TabIndex = 6;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(89, 302);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(112, 17);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "InitialBytesToStrip";
+            // 
+            // TcpPkgConfigDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.buttonCancle;
+            this.ClientSize = new System.Drawing.Size(445, 518);
+            this.Controls.Add(this.InitialBytesToStrip);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.buttonCancle);
+            this.Controls.Add(this.LengthAdjustment);
+            this.Controls.Add(this.LengthFieldLength);
+            this.Controls.Add(this.LengthFieldOffset);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "TcpPkgConfigDialog";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "半包-粘包";
+            this.Load += new System.EventHandler(this.TcpPkgConfigDialog_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.LengthFieldOffset)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LengthFieldLength)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LengthAdjustment)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.InitialBytesToStrip)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.NumericUpDown LengthFieldOffset;
+        private System.Windows.Forms.NumericUpDown LengthFieldLength;
+        private System.Windows.Forms.NumericUpDown LengthAdjustment;
+        private System.Windows.Forms.Button buttonCancle;
+        private System.Windows.Forms.Button buttonOk;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.NumericUpDown InitialBytesToStrip;
+        private System.Windows.Forms.Label label4;
+    }
+}

DotNettyFrom/dialog/TcpPkgConfigDialog.cs

@@ -0,0 +1,39 @@
+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;
+using DotNettyFrom.config;
+
+namespace DotNettyFrom.dialog
+{
+    public partial class TcpPkgConfigDialog : Form
+    {
+        public TcpPkgConfigDialog()
+        {
+            InitializeComponent();
+        }
+
+        private void TcpPkgConfigDialog_Load(object sender, EventArgs e)
+        {
+            LengthFieldOffset.Value = SystemConfig.LengthFieldOffset;
+            LengthFieldLength.Value = SystemConfig.LengthFieldLength;
+            LengthAdjustment.Value = SystemConfig.LengthAdjustment;
+            InitialBytesToStrip.Value = SystemConfig.InitialBytesToStrip;
+        }
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            SystemConfig.LengthFieldOffset = (int) LengthFieldOffset.Value;
+            SystemConfig.LengthFieldLength = (int) LengthFieldLength.Value;
+            SystemConfig.LengthAdjustment = (int) LengthAdjustment.Value;
+            SystemConfig.InitialBytesToStrip = (int) InitialBytesToStrip.Value;
+
+            this.Close();
+        }
+    }
+}

DotNettyFrom/dialog/TcpPkgConfigDialog.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>

DotNettyFrom/generatecmd/CmdGenetor.cs

@@ -8,41 +8,13 @@ using DotNettyFrom.util;
 
 namespace DotNettyFrom.generatecmd
 {
-    public class CmdGenetor
+    public abstract class CmdGenetor
     {
-        public static CmdGenetor Instance = new CmdGenetor();
-        public string DeviceId { get; set; }
+        public string DeviceId;
+        public static CmdGenetor Genetor { get; set; }
 
+        public abstract string GetLoginCmd(string ccid);
 
-        public static CmdGenetor GetInstance()
-        {
-            return Instance;
-        }
-
-        public CmdGenetor SetDeviceId(string deviceId)
-        {
-            this.DeviceId = deviceId;
-            return this;
-        }
-
-        private CmdGenetor()
-        {
-        }
-
-
-        public string GetLoginCmd(string ccid)
-        {
-            string cmd = DeviceId + "820014" + ccid;
-            cmd = "7e7e7e" + CmdUtil.CalcCrcCode(cmd);
-            return cmd;
-        }
-
-        public string GetHeartbeat()
-        {
-            //7e7e7e00000000000184000085
-            string cmd = DeviceId + "840000";
-            cmd = "7e7e7e" + CmdUtil.CalcCrcCode(cmd);
-            return cmd;
-        }
+        public abstract string GetHeartbeat();
     }
 }

DotNettyFrom/generatecmd/DtuCmdGenetor.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DotNettyFrom.generatecmd;
+using DotNettyFrom.util;
+
+namespace DotNettyFrom.generatecmd
+{
+    public class DtuCmdGenetor : CmdGenetor
+    {
+        public override string GetLoginCmd( string ccid)
+        {
+            string cmd = DeviceId + "820014" + ccid;
+            cmd = "7e7e7e" + CmdUtil.CalcCrcCode(cmd);
+            return cmd;
+        }
+
+        public override string GetHeartbeat()
+        {
+            //7e7e7e00000000000184000085
+            string cmd = DeviceId + "840000";
+            cmd = "7e7e7e" + CmdUtil.CalcCrcCode(cmd);
+            return cmd;
+        }
+    }
+}

DotNettyFrom/generatecmd/Water2CmdGenetor.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DotNettyFrom.generatecmd
+{
+    public class Water2CmdGenetor : CmdGenetor
+    {
+        public override string GetLoginCmd( string ccid)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string GetHeartbeat()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

DotNettyFrom/netty/NettyClient.cs

@@ -76,6 +76,7 @@ namespace DotNettyFrom.netty
             if (NettyClientHandler.Context.Channel.Active)
             {
                 IByteBuffer msg = AryUtil.Hex2IByteBuffer(hex);
+                Console.WriteLine(hex);
                 NettyClientHandler.Context.WriteAndFlushAsync(msg);
                 DataModel.ReceCollection.Add(new UIInfoModel("发送", hex).setSendType(SystemConfig.SendType));
             }
@@ -134,20 +135,23 @@ namespace DotNettyFrom.netty
 
             public override void UserEventTriggered(IChannelHandlerContext context, object evt)
             {
-                IdleStateEvent state = (IdleStateEvent) evt;
-
-
-                if (state == IdleStateEvent.ReaderIdleStateEvent)
-                {
-                }
-                else if (state == IdleStateEvent.WriterIdleStateEvent)
-                {
-                    string hb = CmdGenetor.GetInstance().GetHeartbeat();
-                    context.Channel.WriteAndFlushAsync(AryUtil.Hex2IByteBuffer(hb));
-                    DataModel.ReceCollection.Add(new UIInfoModel("发送", hb).setSendType(SystemConfig.SendType));
-                }
-                else
+                if (SystemConfig.OpenHeartBeat)
                 {
+                    IdleStateEvent state = (IdleStateEvent) evt;
+
+
+                    if (state == IdleStateEvent.ReaderIdleStateEvent)
+                    {
+                    }
+                    else if (state == IdleStateEvent.WriterIdleStateEvent)
+                    {
+                        string hb = CmdGenetor.Genetor.GetHeartbeat();
+                        context.Channel.WriteAndFlushAsync(AryUtil.Hex2IByteBuffer(hb));
+                        DataModel.ReceCollection.Add(new UIInfoModel("发送", hb).setSendType(SystemConfig.SendType));
+                    }
+                    else
+                    {
+                    }
                 }
             }