更新

DotNettyFrom.sln.DotSettings.user

@@ -0,0 +1,14 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/ContinuousTesting/ScopeCriterion/@EntryValue">+SNpzQIAAAD5I2nNAgAAAIlsuiH1vSchAgAAANEO3FwfAAAAQwBvAG4AdABpAG4AdQBvAHUAcwBUAGUAcwB0AGkAbgBnAEgAbwBzAHQAUAByAG8AdgBpAGQAZQByAEkAZAAwh2K/AQAAAOWawpcGAAAATQBTAFQAZQBzAHQAJAAAAEIARQA5ADMARQBFAEMANgAtADUAMwBGADMALQA0ADMAQgA5AC0AQgA0AEIAQgAtADIAOQAxAEMARABBAEUANAA2ADIAOQAwABwAAAAuAE4ARQBUAEYAcgBhAG0AZQB3AG8AcgBrACwAVgBlAHIAcwBpAG8AbgA9AHYANAAuADYALgAxACcAAABEAG8AdABOAGUAdAB0AHkARgByAG8AbQBUAGUAcwB0AHMALgBVAG4AaQB0AFQAZQBzAHQAMQAuAFQAZQBzAHQATQBlAHQAaABvAGQAMQD1vSchAgAAANEO3FwfAAAAQwBvAG4AdABpAG4AdQBvAHUAcwBUAGUAcwB0AGkAbgBnAEgAbwBzAHQAUAByAG8AdgBpAGQAZQByAEkAZAAwh2K/AQAAAOWawpcGAAAATQBTAFQAZQBzAHQAJAAAAEIARQA5ADMARQBFAEMANgAtADUAMwBGADMALQA0ADMAQgA5AC0AQgA0AEIAQgAtADIAOQAxAEMARABBAEUANAA2ADIAOQAwABwAAAAuAE4ARQBUAEYAcgBhAG0AZQB3AG8AcgBrACwAVgBlAHIAcwBpAG8AbgA9AHYANAAuADYALgAxAEMAAABEAG8AdABOAGUAdAB0AHkARgByAG8AbQBUAGUAcwB0AHMALgBnAGUAbgBlAHIAYQB0AGUAYwBtAGQALgBXAGEAdABlAHIAMgBDAG0AZABHAGUAbgBlAHQAbwByAFQAZQBzAHQAcwAuAEcAZQB0AFIAZQBwAGwAeQBDAG0AZABUAGUAcwB0AA==</s:String>
+	<s:String x:Key="/Default/Environment/ContinuousTesting/Strategy/@EntryValue">DetectTests</s:String>
+	<s:String x:Key="/Default/Environment/ContinuousTesting/TriggerMode/@EntryValue">OnSave</s:String>
+	
+	
+	
+	
+	
+	
+	<s:Int64 x:Key="/Default/Environment/ContinuousTestingSessionDescriptor/GroupingIndex/@EntryValue">2</s:Int64>
+	<s:Boolean x:Key="/Default/Environment/ContinuousTestingSessionDescriptor/ShowTime/@EntryValue">True</s:Boolean>
+	
+	</wpf:ResourceDictionary>

DotNettyFrom/DotNettyFrom.csproj

@@ -62,6 +62,9 @@
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
@@ -129,9 +132,18 @@
   <ItemGroup>
     <Compile Include="common\DataModel.cs" />
     <Compile Include="common\UIInfoModel..cs" />
+    <Compile Include="config\ConfigChange.cs" />
     <Compile Include="config\DBConfig.cs" />
+    <Compile Include="config\DtuConfig.cs" />
     <Compile Include="config\SystemConfig.cs" />
+    <Compile Include="config\Water2Config.cs" />
     <Compile Include="db\DBHelper.cs" />
+    <Compile Include="dialog\FrameConfigDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dialog\FrameConfigDialog.Designer.cs">
+      <DependentUpon>FrameConfigDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="dialog\HeartBeatTime.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -182,6 +194,9 @@
     <Compile Include="model\WvBean.cs" />
     <Compile Include="util\HexUtil.cs" />
     <Compile Include="util\Utils.cs" />
+    <EmbeddedResource Include="dialog\FrameConfigDialog.resx">
+      <DependentUpon>FrameConfigDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="dialog\HeartBeatTime.resx">
       <DependentUpon>HeartBeatTime.cs</DependentUpon>
     </EmbeddedResource>

DotNettyFrom/MainForm.Designer.cs

@@ -48,22 +48,31 @@
             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.配置TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RT_HB_Enable = new System.Windows.Forms.ToolStripMenuItem();
+            this.LogHbtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RT_HB_Time = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.FrametoolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.HalfPkgToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.TSMI_ClearAll = new System.Windows.Forms.ToolStripMenuItem();
             this.历史HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RT_HI_Host = new System.Windows.Forms.ToolStripMenuItem();
             this.RT_HI_DeviceId = new System.Windows.Forms.ToolStripMenuItem();
             this.RT_HI_CCID = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.RT_HI_SendData = new System.Windows.Forms.ToolStripMenuItem();
-            this.配置CToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HalfPkgToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.指令MToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.LoginToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.HeartBeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
             this.StatusItemHbTime = new System.Windows.Forms.ToolStripStatusLabel();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.BtnFixCmd = new System.Windows.Forms.Button();
+            this.BtnAutoUpload = new System.Windows.Forms.Button();
             this.BtnClearAll = new System.Windows.Forms.Button();
             this.TbSendData = new System.Windows.Forms.TextBox();
             this.label5 = new System.Windows.Forms.Label();
@@ -164,7 +173,7 @@
             this.TbHost.Name = "TbHost";
             this.TbHost.Size = new System.Drawing.Size(280, 22);
             this.TbHost.TabIndex = 1;
-            this.TbHost.Text = "i.device.yun.vcarefire.com";
+            this.TbHost.Text = "127.0.0.1";
             // 
             // TbPort
             // 
@@ -173,7 +182,7 @@
             this.TbPort.Name = "TbPort";
             this.TbPort.Size = new System.Drawing.Size(57, 22);
             this.TbPort.TabIndex = 1;
-            this.TbPort.Text = "15443";
+            this.TbPort.Text = "15440";
             this.TbPort.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TbPort_KeyPress);
             // 
             // BtnConnection
@@ -226,9 +235,9 @@
             // 
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.文件FToolStripMenuItem,
-            this.时间TToolStripMenuItem,
+            this.配置TToolStripMenuItem,
             this.历史HToolStripMenuItem,
-            this.配置CToolStripMenuItem});
+            this.指令MToolStripMenuItem});
             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);
@@ -248,30 +257,33 @@
             // dtuToolStripMenuItem
             // 
             this.dtuToolStripMenuItem.Checked = true;
-            this.dtuToolStripMenuItem.CheckOnClick = true;
             this.dtuToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.dtuToolStripMenuItem.Name = "dtuToolStripMenuItem";
-            this.dtuToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.dtuToolStripMenuItem.Text = "dtu";
+            this.dtuToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
+            this.dtuToolStripMenuItem.Text = "Dtu";
             this.dtuToolStripMenuItem.Click += new System.EventHandler(this.dtuToolStripMenuItem_Click);
             // 
             // water2ToolStripMenuItem
             // 
-            this.water2ToolStripMenuItem.CheckOnClick = true;
             this.water2ToolStripMenuItem.Name = "water2ToolStripMenuItem";
-            this.water2ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.water2ToolStripMenuItem.Text = "water2";
+            this.water2ToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
+            this.water2ToolStripMenuItem.Text = "Water2";
             this.water2ToolStripMenuItem.Click += new System.EventHandler(this.water2ToolStripMenuItem_Click);
             // 
-            // 时间TToolStripMenuItem
+            // 配置TToolStripMenuItem
             // 
-            this.时间TToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.配置TToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RT_HB_Enable,
+            this.LogHbtoolStripMenuItem,
             this.RT_HB_Time,
-            this.toolStripSeparator1});
-            this.时间TToolStripMenuItem.Name = "时间TToolStripMenuItem";
-            this.时间TToolStripMenuItem.Size = new System.Drawing.Size(59, 21);
-            this.时间TToolStripMenuItem.Text = "时间(&T)";
+            this.toolStripSeparator1,
+            this.FrametoolStripMenuItem1,
+            this.HalfPkgToolStripMenuItem,
+            this.toolStripSeparator5,
+            this.TSMI_ClearAll});
+            this.配置TToolStripMenuItem.Name = "配置TToolStripMenuItem";
+            this.配置TToolStripMenuItem.Size = new System.Drawing.Size(60, 21);
+            this.配置TToolStripMenuItem.Text = "配置(&C)";
             // 
             // RT_HB_Enable
             // 
@@ -279,21 +291,56 @@
             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(141, 22);
+            this.RT_HB_Enable.Size = new System.Drawing.Size(180, 22);
             this.RT_HB_Enable.Text = "启用心跳";
             this.RT_HB_Enable.Click += new System.EventHandler(this.RT_HB_Enable_Click);
             // 
+            // LogHbtoolStripMenuItem
+            // 
+            this.LogHbtoolStripMenuItem.CheckOnClick = true;
+            this.LogHbtoolStripMenuItem.Name = "LogHbtoolStripMenuItem";
+            this.LogHbtoolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.LogHbtoolStripMenuItem.Text = "打印心跳";
+            this.LogHbtoolStripMenuItem.Click += new System.EventHandler(this.LogHbtoolStripMenuItem_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.Text = "心跳超时(&H)";
+            this.RT_HB_Time.Size = new System.Drawing.Size(180, 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(177, 6);
+            // 
+            // FrametoolStripMenuItem1
+            // 
+            this.FrametoolStripMenuItem1.Name = "FrametoolStripMenuItem1";
+            this.FrametoolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
+            this.FrametoolStripMenuItem1.Text = "帧配置";
+            // 
+            // HalfPkgToolStripMenuItem
+            // 
+            this.HalfPkgToolStripMenuItem.Enabled = false;
+            this.HalfPkgToolStripMenuItem.Name = "HalfPkgToolStripMenuItem";
+            this.HalfPkgToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.HalfPkgToolStripMenuItem.Text = "半包-粘包";
+            this.HalfPkgToolStripMenuItem.Click += new System.EventHandler(this.HalfPkgToolStripMenuItem_Click_1);
+            // 
+            // toolStripSeparator5
+            // 
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
+            // 
+            // TSMI_ClearAll
+            // 
+            this.TSMI_ClearAll.Name = "TSMI_ClearAll";
+            this.TSMI_ClearAll.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C)));
+            this.TSMI_ClearAll.Size = new System.Drawing.Size(180, 22);
+            this.TSMI_ClearAll.Text = "清空信息(&A)";
+            this.TSMI_ClearAll.Click += new System.EventHandler(this.TSMI_ClearAll_Click);
             // 
             // 历史HToolStripMenuItem
             // 
@@ -340,20 +387,32 @@
             this.RT_HI_SendData.Text = "发送数据";
             this.RT_HI_SendData.Click += new System.EventHandler(this.RT_HI_SendData_Click);
             // 
-            // 配置CToolStripMenuItem
+            // 指令MToolStripMenuItem
             // 
-            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)";
+            this.指令MToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.LoginToolStripMenuItem,
+            this.HeartBeatToolStripMenuItem,
+            this.toolStripSeparator6});
+            this.指令MToolStripMenuItem.Name = "指令MToolStripMenuItem";
+            this.指令MToolStripMenuItem.Size = new System.Drawing.Size(64, 21);
+            this.指令MToolStripMenuItem.Text = "指令(&M)";
             // 
-            // HalfPkgToolStripMenuItem
+            // LoginToolStripMenuItem
             // 
-            this.HalfPkgToolStripMenuItem.Name = "HalfPkgToolStripMenuItem";
-            this.HalfPkgToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
-            this.HalfPkgToolStripMenuItem.Text = "半包-粘包";
-            this.HalfPkgToolStripMenuItem.Click += new System.EventHandler(this.HalfPkgToolStripMenuItem_Click);
+            this.LoginToolStripMenuItem.Name = "LoginToolStripMenuItem";
+            this.LoginToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+            this.LoginToolStripMenuItem.Text = "登录(&L)";
+            // 
+            // HeartBeatToolStripMenuItem
+            // 
+            this.HeartBeatToolStripMenuItem.Name = "HeartBeatToolStripMenuItem";
+            this.HeartBeatToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+            this.HeartBeatToolStripMenuItem.Text = "心跳(&H)";
+            // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(114, 6);
             // 
             // statusStrip1
             // 
@@ -382,6 +441,8 @@
             // 
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.BtnFixCmd);
+            this.groupBox1.Controls.Add(this.BtnAutoUpload);
             this.groupBox1.Controls.Add(this.BtnClearAll);
             this.groupBox1.Controls.Add(this.TbSendData);
             this.groupBox1.Controls.Add(this.label5);
@@ -406,6 +467,26 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = " ";
             // 
+            // BtnFixCmd
+            // 
+            this.BtnFixCmd.Location = new System.Drawing.Point(750, 45);
+            this.BtnFixCmd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.BtnFixCmd.Name = "BtnFixCmd";
+            this.BtnFixCmd.Size = new System.Drawing.Size(87, 31);
+            this.BtnFixCmd.TabIndex = 13;
+            this.BtnFixCmd.Text = "内置指令";
+            this.BtnFixCmd.UseVisualStyleBackColor = true;
+            // 
+            // BtnAutoUpload
+            // 
+            this.BtnAutoUpload.Location = new System.Drawing.Point(657, 45);
+            this.BtnAutoUpload.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.BtnAutoUpload.Name = "BtnAutoUpload";
+            this.BtnAutoUpload.Size = new System.Drawing.Size(87, 31);
+            this.BtnAutoUpload.TabIndex = 12;
+            this.BtnAutoUpload.Text = "主动上报";
+            this.BtnAutoUpload.UseVisualStyleBackColor = true;
+            // 
             // BtnClearAll
             // 
             this.BtnClearAll.Location = new System.Drawing.Point(564, 45);
@@ -495,7 +576,7 @@
             this.TbDeviceId.Name = "TbDeviceId";
             this.TbDeviceId.Size = new System.Drawing.Size(157, 22);
             this.TbDeviceId.TabIndex = 4;
-            this.TbDeviceId.Text = "000000000001";
+            this.TbDeviceId.Text = "000000000002";
             // 
             // label2
             // 
@@ -556,7 +637,7 @@
         private System.Windows.Forms.MenuStrip menuStrip1;
         private System.Windows.Forms.ToolStripMenuItem 文件FToolStripMenuItem;
         private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.ToolStripMenuItem 时间TToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 配置TToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem RT_HB_Time;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
@@ -590,8 +671,17 @@
         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;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+        private System.Windows.Forms.ToolStripMenuItem TSMI_ClearAll;
+        private System.Windows.Forms.Button BtnAutoUpload;
+        private System.Windows.Forms.Button BtnFixCmd;
+        private System.Windows.Forms.ToolStripMenuItem FrametoolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem 指令MToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem LoginToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem HeartBeatToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+        private System.Windows.Forms.ToolStripMenuItem LogHbtoolStripMenuItem;
     }
 }
 

DotNettyFrom/MainForm.cs

@@ -28,6 +28,7 @@ namespace DotNettyFrom
         private NettyClient _nettyClient;
         private string host;
         private int port;
+        
 
         #endregion
 
@@ -47,14 +48,9 @@ namespace DotNettyFrom
 
             DbHelper.Init();
 
-
-//            DBHelper.ConnectionAccessDb();
-
-
             UpdateUiComponent();
 
-            this.Text = "模拟器-DTU";
-            CmdGenetor.Genetor = new DtuCmdGenetor();
+            ChangeDtu();
 
             if ("".Equals(TbDeviceId.Text.Trim()))
             {
@@ -82,7 +78,17 @@ namespace DotNettyFrom
 
         private void CallUI(UIInfoModel value)
         {
-            LBLogShow.Items.Add(value);
+            if (value.cmdId != SystemConfig.HeartbeatDownCmdCode)
+            {
+                LBLogShow.Items.Add(value);
+            }
+            else
+            {
+                if (SystemConfig.IsLogHeartBeatInfo)
+                {
+                    LBLogShow.Items.Add(value);
+                }
+            }
             LBLogShow.TopIndex = LBLogShow.Items.Count - 1;
             if (LBLogShow.Items.Count > SystemConfig.LBLogShowClearCount)
             {
@@ -105,31 +111,40 @@ namespace DotNettyFrom
 
         private void ConnectionActive()
         {
-            TbHost.Enabled = false;
-            TbPort.Enabled = false;
-            TbDeviceId.Enabled = false;
-            TbCCID.Enabled = false;
+            TbHost.ReadOnly = true;
+            TbPort.ReadOnly = true;
+            TbDeviceId.ReadOnly = true;
+            TbCCID.ReadOnly = true;
 
             BtnConnection.Enabled = false;
             BtnLogin.Enabled = false;
 
             BtnDisConn.Enabled = true;
             BtnSendData.Enabled = true;
+
+            water2ToolStripMenuItem.Enabled = false;
+            dtuToolStripMenuItem.Enabled = false;
+
         }
 
 
         private void ConnectionInActive()
         {
-            TbHost.Enabled = true;
-            TbPort.Enabled = true;
-            TbDeviceId.Enabled = true;
-            TbCCID.Enabled = true;
+            TbHost.ReadOnly = false;
+            TbPort.ReadOnly = false;
+            TbDeviceId.ReadOnly = false;
+            TbCCID.ReadOnly = false;
 
             BtnConnection.Enabled = true;
             BtnLogin.Enabled = true;
 
             BtnDisConn.Enabled = false;
             BtnSendData.Enabled = false;
+
+
+
+            water2ToolStripMenuItem.Enabled = true;
+            dtuToolStripMenuItem.Enabled = true;
         }
 
         private void BeforeConnection()
@@ -156,23 +171,32 @@ namespace DotNettyFrom
                                     "/s";
         }
 
-        #region Component Event
 
-        private void BtnConnection_Click(object sender, EventArgs e)
+        private void ChangeWater2()
         {
-            /* var producer = Task.Factory.StartNew(() =>
-             {
-                 for (int count = 0; count < 1000; count++)
-                 {
+            this.Text = "模拟器-Water2";
+            dtuToolStripMenuItem.Checked = false;
+            water2ToolStripMenuItem.Checked = true;
+            CmdGenetor.Genetor = null;
+            CmdGenetor.Genetor = new Water2CmdGenetor();
+
+            ConfigChange.ChangeDevice(SystemConfig.Water2);
+        }
 
+        private void ChangeDtu()
+        {
+            this.Text = "模拟器-DTU";
+            water2ToolStripMenuItem.Checked = false;
+            dtuToolStripMenuItem.Checked = true;
+            CmdGenetor.Genetor = null;
+            CmdGenetor.Genetor = new DtuCmdGenetor();
+            ConfigChange.ChangeDevice(SystemConfig.Dtu);
+        }
 
-                 }
-                 //                blockingCollection.CompleteAdding();
-             });*/
-            /*_nettyClient = new NettyClient();
-            t = new Thread(() => { _nettyClient.StartNetty("127.0.0.1", 4001); });
-            t.Start();*/
+        #region Component Event
 
+        private void BtnConnection_Click(object sender, EventArgs e)
+        {
             BeforeConnection();
 
             CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
@@ -230,20 +254,15 @@ namespace DotNettyFrom
 
         private void dtuToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            this.Text = "模拟器-DTU";
-            water2ToolStripMenuItem.Checked = false;
-            CmdGenetor.Genetor = null;
-            CmdGenetor.Genetor = new DtuCmdGenetor();
+            ChangeDtu();
         }
 
         private void water2ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            this.Text = "模拟器-Water2";
-            dtuToolStripMenuItem.Checked = false;
-            CmdGenetor.Genetor = null;
-            CmdGenetor.Genetor = new Water2CmdGenetor();
+            ChangeWater2();
         }
 
+
         private void BtnClearAll_Click(object sender, EventArgs e) => LBLogShow.Items.Clear();
 
         private void BtnCmdManager_Click(object sender, EventArgs e)
@@ -260,6 +279,12 @@ namespace DotNettyFrom
             hd.ShowDialog();
         }
 
+        private void HalfPkgToolStripMenuItem_Click_1(object sender, EventArgs e)
+        {
+            TcpPkgConfigDialog tcpDialog = new TcpPkgConfigDialog();
+            tcpDialog.ShowDialog();
+        }
+
         private void RT_HI_DeviceId_Click(object sender, EventArgs e)
         {
             HistoryDialog hd = new HistoryDialog(SystemConfig.AddrHisType);
@@ -281,14 +306,14 @@ namespace DotNettyFrom
             hd.ShowDialog();
         }
 
-        private void Hd_HistoryHandler(string type, string result)
+        private void TSMI_ClearAll_Click(object sender, EventArgs e)
         {
+            BtnClearAll_Click(null, null);
         }
 
-        private void HalfPkgToolStripMenuItem_Click(object sender, EventArgs e)
+
+        private void Hd_HistoryHandler(string type, string result)
         {
-            TcpPkgConfigDialog tcpDialog = new TcpPkgConfigDialog();
-            tcpDialog.ShowDialog();
         }
 
         #endregion
@@ -390,5 +415,10 @@ namespace DotNettyFrom
         private void LB_Context_ClearAll_Click(object sender, EventArgs e) => LBLogShow.Items.Clear();
 
         #endregion
+
+        private void LogHbtoolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            SystemConfig.IsLogHeartBeatInfo = LogHbtoolStripMenuItem.Checked;
+        }
     }
 }

DotNettyFrom/common/UIInfoModel..cs

@@ -16,6 +16,9 @@ namespace DotNettyFrom.common
 
         public string cmd = "";
 
+        public int cmdId = int.MinValue;
+
+
         //1 发送的. 0:接收的, -1.日常信息
         public int SendType = SystemConfig.RecType;
 
@@ -24,6 +27,7 @@ namespace DotNettyFrom.common
         {
             this.info = info;
             this.cmd = cmd;
+            cmdId = CalcCmdId(cmd);
         }
 
 
@@ -47,6 +51,7 @@ namespace DotNettyFrom.common
         public UIInfoModel setCmd(string cmd)
         {
             this.cmd = cmd;
+            cmdId = CalcCmdId(cmd);
             return this;
         }
 
@@ -70,8 +75,9 @@ namespace DotNettyFrom.common
             {
                 try
                 {
-                    string cmdId = cmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
-                    res += ". cmdId=" + cmdId;
+                    string cmdIdString = cmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
+                    res += ". cmdId=" + cmdIdString;
+                    cmdId = CalcCmdId(cmd);
                 }
                 catch (Exception)
                 {
@@ -80,5 +86,18 @@ namespace DotNettyFrom.common
             }
             return res + ".";
         }
+
+        public int CalcCmdId(string cmd)
+        {
+            try
+            {
+                string cmdId = cmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
+                return int.Parse(cmdId);
+            }
+            catch (Exception)
+            {
+            }
+            return int.MinValue;
+        }
     }
 }

DotNettyFrom/config/ConfigChange.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DotNettyFrom.config
+{
+    public class ConfigChange
+    {
+        public static void ChangeDevice(int type)
+        {
+            switch (type)
+            {
+                case SystemConfig.Dtu:
+                    changeDTU();
+                    break;
+                case SystemConfig.Water2:
+                    changeWater2();
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private static void changeWater2()
+        {
+            SystemConfig.CurrentType = SystemConfig.Water2;
+
+            SystemConfig.FunctionCodeStartPos = Water2Config.FunctionCodeStartPos;
+            SystemConfig.FunctionCodeLength = Water2Config.FunctionCodeLength;
+
+            SystemConfig.HeartbeatDownCmdCode = Water2Config.HeartbeatDownCmdCode;
+
+            SystemConfig.LengthFieldOffset = Water2Config.LengthFieldOffset;
+            SystemConfig.LengthFieldLength = Water2Config.LengthFieldLength;
+            SystemConfig.LengthAdjustment = Water2Config.LengthAdjustment;
+            SystemConfig.InitialBytesToStrip = Water2Config.InitialBytesToStrip;
+
+            SystemConfig.MeasurePointLen = Water2Config.MeasurePointLen;
+            SystemConfig.MessageFlowLen = Water2Config.MessageFlowLen;
+      
+    }
+
+        private static void changeDTU()
+        {
+            SystemConfig.CurrentType = SystemConfig.Dtu;
+
+            SystemConfig.FunctionCodeStartPos = DtuConfig.FunctionCodeStartPos;
+            SystemConfig.FunctionCodeLength = DtuConfig.FunctionCodeLength;
+
+            SystemConfig.HeartbeatDownCmdCode = DtuConfig.HeartbeatDownCmdCode;
+
+            SystemConfig.LengthFieldOffset = DtuConfig.LengthFieldOffset;
+            SystemConfig.LengthFieldLength = DtuConfig.LengthFieldLength;
+            SystemConfig.LengthAdjustment = DtuConfig.LengthAdjustment;
+            SystemConfig.InitialBytesToStrip = DtuConfig.InitialBytesToStrip;
+
+            SystemConfig.MeasurePointLen = DtuConfig.MeasurePointLen;
+            SystemConfig.MessageFlowLen = DtuConfig.MessageFlowLen;
+        }
+    }
+}

DotNettyFrom/config/DBConfig.cs

@@ -16,8 +16,23 @@ namespace DotNettyFrom.config
 
         //历史表
         public const string IpHis = "ip_his";
+
         public const string SendHis = "send_his";
         public const string CcidHis = "ccid_his";
         public const string AddrHis = "addr_his";
+
+
+        public static string GetTableName()
+        {
+            if (SystemConfig.CurrentType == SystemConfig.Dtu)
+            {
+                return "dtu";
+            }
+            else if (SystemConfig.CurrentType == SystemConfig.Water2)
+            {
+                return "water2";
+            }
+            return "dtu";
+        }
     }
 }

DotNettyFrom/config/DtuConfig.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DotNettyFrom.config
+{
+    public class DtuConfig
+    {
+        //功能码的位置,长度
+        public static int FunctionCodeStartPos = 18;
+        public static int FunctionCodeLength = 2;
+
+
+        //心跳指令的功能码,用来判定是否是心跳
+        public static int HeartbeatDownCmdCode = 4;
+
+
+        public static int LengthFieldOffset = 10;
+        public static int LengthFieldLength = 2;
+        public static int LengthAdjustment = 1;
+        public static int InitialBytesToStrip = 0;
+
+        public static int MeasurePointLen = 1;
+        public static int MessageFlowLen = 2;
+    }
+}

DotNettyFrom/config/SystemConfig.cs

@@ -8,33 +8,57 @@ namespace DotNettyFrom.config
 {
     public class SystemConfig
     {
+        public const int Dtu = 1;
+        public const int Water2 = 2;
+
+        //当前是哪一个设备
+        public static int CurrentType;
+
+        //是否打印心跳指令
+        public static bool IsLogHeartBeatInfo = false;
+
+        //心跳指令的功能码,用来判定是否是心跳
+        public static int HeartbeatDownCmdCode = 4;
+
+        //功能码的位置,长度
         public static int FunctionCodeStartPos = 18;
-        public static int FunctionCodeLength = 2;
 
+        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;
 
 
+        //测量点&消息流水
+        public static int MeasurePointLen = 1;
+        public static int MessageFlowLen = 2;
+
+
+
+        //粘包-半包问题
         public static int LengthFieldOffset = 10;
         public static int LengthFieldLength = 2;
         public static int LengthAdjustment = 1;
         public static int InitialBytesToStrip = 0;
 
+        //ListBox最多显示条数
         public static int LBLogShowClearCount = 1000;
 
+        //----------------------------------------------------------------
 
         //1 发送的. 0:接收的, -1.Debug.日常信息
         public static int SendType = 1;
-
         public static int RecType = 0;
         public static int DebugType = -1;
         public static int ReplyType = 2;
 
-
+        //数据库对应
         public const int IpHisType = 1;
         public const int AddrHisType = 2;
         public const int SendHisType = 3;

DotNettyFrom/config/Water2Config.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DotNettyFrom.config
+{
+    public class Water2Config
+    {
+        //功能码的位置,长度
+        public static int FunctionCodeStartPos = 18;
+        public static int FunctionCodeLength = 2;
+
+        //心跳指令的功能码,用来判定是否是心跳
+        public static int HeartbeatDownCmdCode = 3;
+
+        public static int LengthFieldOffset = 10;
+        public static int LengthFieldLength = 1;
+        public static int LengthAdjustment = 2;
+        public static int InitialBytesToStrip = 0;
+
+
+        public static int MeasurePointLen = 0;
+        public static int MessageFlowLen = 2;
+
+    }
+}

DotNettyFrom/db/DBHelper.cs

@@ -23,10 +23,17 @@ namespace DotNettyFrom.db
         private OleDbConnection _DbConn = null;
 
 
-        private DbHelper()
+        private DbHelper(string dbPath)
         {
             _idInfo = new Dictionary<string, string>();
-            _DbConn = new OleDbConnection(DBConfig.ConnStr + Application.StartupPath + @"\" + DBConfig.DbFileName);
+            if (dbPath.Equals(""))
+            {
+                _DbConn = new OleDbConnection(DBConfig.ConnStr + Application.StartupPath + @"\" + DBConfig.DbFileName);
+            }
+            else
+            {
+                _DbConn = new OleDbConnection(DBConfig.ConnStr + dbPath);
+            }
             _DbConn.Open();
         }
 
@@ -36,13 +43,13 @@ namespace DotNettyFrom.db
         }
 
 
-        public static void Init()
+        public static void Init(string dbPath = "")
         {
             lock (locker)
             {
                 if (Instance == null)
                 {
-                    Instance = new DbHelper();
+                    Instance = new DbHelper(dbPath);
                 }
             }
         }
@@ -60,20 +67,25 @@ namespace DotNettyFrom.db
         //reset user value
         public int ResetUserData()
         {
-            string sql = "update fw set user_value=default_value";
+            string table = DBConfig.GetTableName();
+            string sql = "update " + table + " set user_value=default_value";
             using (OleDbCommand inst = new OleDbCommand(sql, _DbConn))
             {
                 return inst.ExecuteNonQuery();
             }
         }
 
-        //Insert
+        //Insert CMD
         public int InsertCmd(WvBean wb)
         {
             if (wb == null)
+            {
                 return -1;
+            }
+            string table = DBConfig.GetTableName();
             string sql =
-                "INSERT INTO fw(my_index,MY_ID,idInfo,len,mode,desp,default_value,user_value,remark) VALUES(";
+                "INSERT INTO " + table +
+                "(my_index,MY_ID,idInfo,len,mode,desp,default_value,user_value,remark,protocol_no) VALUES(";
             sql += wb.index + ",";
             sql += "'" + wb.myId + "',";
             sql += "'" + wb.idInfo + "',";
@@ -82,7 +94,8 @@ namespace DotNettyFrom.db
             sql += "'" + wb.desp + "',";
             sql += "'" + wb.defalutValue + "',";
             sql += "'" + wb.userValue + "',";
-            sql += "'" + wb.remark + "')";
+            sql += "'" + wb.remark + "',";
+            sql += wb.protocolNo + ")";
             using (OleDbCommand inst = new OleDbCommand(sql, _DbConn))
             {
                 return inst.ExecuteNonQuery();
@@ -121,22 +134,30 @@ namespace DotNettyFrom.db
         //Delete
         public int DeleteCmdById(int id)
         {
-            string sql = "delete from fw where ID=" + id;
+            string table = DBConfig.GetTableName();
+            string sql = "delete from " + table + " where ID=" + id;
             using (OleDbCommand inst = new OleDbCommand(sql, _DbConn))
             {
                 return inst.ExecuteNonQuery();
             }
         }
 
-        public int DeleteAllFwData()
+        public int DeleteAllData()
         {
-            string sql = @"delete from fw";
+            string table = DBConfig.GetTableName();
+            string sql = @"delete from " + table;
             using (OleDbCommand inst = new OleDbCommand(sql, _DbConn))
             {
                 return inst.ExecuteNonQuery();
             }
         }
 
+        /// <summary>
+        /// 删除历史记录
+        /// </summary>
+        /// <param name="_type"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
         public int DeleteHistoryById(int _type, int id)
         {
             string tableName;
@@ -164,6 +185,11 @@ namespace DotNettyFrom.db
             }
         }
 
+        /// <summary>
+        /// 删除所有历史记录
+        /// </summary>
+        /// <param name="_type"></param>
+        /// <returns></returns>
         public int DeleteAllHistory(int _type)
         {
             string tableName;
@@ -194,7 +220,10 @@ namespace DotNettyFrom.db
         //Update
         public int UpdateCmd(WvBean wb)
         {
-            string updateSQL = "update fw set my_index=" + wb.index + ",MY_ID=\"" + wb.myId + "\",idInfo=\"" +
+            string table = DBConfig.GetTableName();
+
+            string updateSQL = "update " + table + " set my_index=" + wb.index + ",MY_ID=\"" + wb.myId +
+                               "\",idInfo=\"" +
                                wb.idInfo +
                                "\",len=\"" + wb.len +
                                "\",mode=\"" +
@@ -209,10 +238,15 @@ namespace DotNettyFrom.db
         }
 
         //Select
-        public DataTable SelectCmds(string sql = @"select * from fw")
+        public DataTable SelectCmds(string sql = null)
         {
+            if (sql == null)
+            {
+                string table = DBConfig.GetTableName();
+                sql = @"select * from " + table;
+            }
+
             DataTable dataTable = new DataTable();
-//            string sql = @"select * from fw";
 
             using (OleDbCommand sqlcmd = new OleDbCommand(sql, _DbConn))
             {
@@ -228,61 +262,40 @@ namespace DotNettyFrom.db
                         var userValue = CheckUtil.StringIsEmpty(reader.GetString(8));
                         if (!_idInfo.ContainsKey(myId))
                             _idInfo.Add(myId, userValue);
-
-                        /*WvBean wb = new WvBean();
-                        int id = 0;
-                        int index = 0;
-                        var myId = "";
-                        var idInfo = "";
-                        var len = "";
-                        var mode = "";
-                        var desp = "";
-                        var defalutValue = "";
-                        var userValue = "";
-                        var remark = "";
-
-                        id = reader.GetInt32(0);
-                        index = reader.GetInt32(1);
-                        myId = reader.GetString(2);
-                        idInfo = CheckUtil.StringIsEmpty(reader.GetString(3));
-                        len = CheckUtil.StringIsEmpty(reader.GetString(4));
-                        mode = CheckUtil.StringIsEmpty(reader.GetString(5));
-                        desp = CheckUtil.StringIsEmpty(reader.GetString(6));
-                        defalutValue = CheckUtil.StringIsEmpty(reader.GetString(7));
-                        userValue = CheckUtil.StringIsEmpty(reader.GetString(8));
-                        remark = CheckUtil.StringIsEmpty(reader.GetString(9));
-
-                        wb.id = id;
-                        wb.index = index;
-                        wb.myId = myId;
-                        wb.idInfo = idInfo;
-                        wb.len = len;
-                        wb.mode = mode;
-                        wb.desp = desp;
-                        wb.defalutValue = defalutValue;
-                        wb.userValue = userValue;
-                        wb.remark = remark;
-
-                        if (!_idInfo.ContainsKey(myId))
-                            _idInfo.Add(myId, userValue);*/
                     }
                 }
             }
             return dataTable;
         }
 
+        public WvBean SelectOneCmdByIndex(int index)
+        {
+            string table = DBConfig.GetTableName();
+            string sql = @"select * from " + table + " where my_index=" + index;
+            return SelectOneCmd(sql);
+        }
+
         public WvBean SelectOneCmdById(int _id)
         {
-            WvBean wb = new WvBean();
-            string sql = @"select * from fw where id=" + _id;
+            string table = DBConfig.GetTableName();
+            string sql = @"select * from " + table + " where id=" + _id;
+            return SelectOneCmd(sql);
+        }
+
+        private WvBean SelectOneCmd(string sql)
+        {
+            WvBean wb = null;
             using (OleDbCommand sqlcmd = new OleDbCommand(sql, _DbConn))
             {
                 OleDbDataAdapter adapter = new OleDbDataAdapter(sqlcmd);
 
+                #region 读数据
+
                 using (OleDbDataReader reader = sqlcmd.ExecuteReader())
                 {
                     while (reader.Read()) //这个read调用很重要！不写的话运行时将提示找不到数据  
                     {
+                        wb = new WvBean();
                         int id = 0;
                         int index = 0;
                         var myId = "";
@@ -293,6 +306,7 @@ namespace DotNettyFrom.db
                         var defalutValue = "";
                         var userValue = "";
                         var remark = "";
+                        var protocolNo = 0;
 
                         id = reader.GetInt32(0);
                         index = reader.GetInt32(1);
@@ -304,6 +318,7 @@ namespace DotNettyFrom.db
                         defalutValue = CheckUtil.StringIsEmpty(reader.GetString(7));
                         userValue = CheckUtil.StringIsEmpty(reader.GetString(8));
                         remark = CheckUtil.StringIsEmpty(reader.GetString(9));
+                        protocolNo = reader.GetInt32(10);
 
                         wb.id = id;
                         wb.index = index;
@@ -315,14 +330,18 @@ namespace DotNettyFrom.db
                         wb.defalutValue = defalutValue;
                         wb.userValue = userValue;
                         wb.remark = remark;
+                        wb.protocolNo = protocolNo;
 
                         break;
                     }
                 }
+
+                #endregion
             }
             return wb;
         }
 
+
         public DataTable SelectHistory(string sql)
         {
             DataTable dataTable = new DataTable();

DotNettyFrom/dialog/FrameConfigDialog.Designer.cs

@@ -0,0 +1,50 @@
+namespace DotNettyFrom.dialog
+{
+    partial class FrameConfigDialog
+    {
+        /// <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.SuspendLayout();
+            // 
+            // FrameConfigDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(613, 536);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrameConfigDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "FrameConfigDialog";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

DotNettyFrom/dialog/FrameConfigDialog.cs

@@ -0,0 +1,20 @@
+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 DotNettyFrom.dialog
+{
+    public partial class FrameConfigDialog : Form
+    {
+        public FrameConfigDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -39,6 +39,8 @@
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.InitialBytesToStrip = new System.Windows.Forms.NumericUpDown();
             this.label4 = new System.Windows.Forms.Label();
+            this.buttonDtu = new System.Windows.Forms.Button();
+            this.buttonWater2 = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.LengthFieldOffset)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.LengthFieldLength)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.LengthAdjustment)).BeginInit();
@@ -139,12 +141,34 @@
             this.label4.TabIndex = 5;
             this.label4.Text = "InitialBytesToStrip";
             // 
+            // buttonDtu
+            // 
+            this.buttonDtu.Location = new System.Drawing.Point(123, 47);
+            this.buttonDtu.Name = "buttonDtu";
+            this.buttonDtu.Size = new System.Drawing.Size(75, 23);
+            this.buttonDtu.TabIndex = 7;
+            this.buttonDtu.Text = "DTU";
+            this.buttonDtu.UseVisualStyleBackColor = true;
+            this.buttonDtu.Click += new System.EventHandler(this.buttonDtu_Click);
+            // 
+            // buttonWater2
+            // 
+            this.buttonWater2.Location = new System.Drawing.Point(210, 47);
+            this.buttonWater2.Name = "buttonWater2";
+            this.buttonWater2.Size = new System.Drawing.Size(75, 23);
+            this.buttonWater2.TabIndex = 7;
+            this.buttonWater2.Text = "水";
+            this.buttonWater2.UseVisualStyleBackColor = true;
+            this.buttonWater2.Click += new System.EventHandler(this.buttonWater2_Click);
+            // 
             // 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.buttonWater2);
+            this.Controls.Add(this.buttonDtu);
             this.Controls.Add(this.InitialBytesToStrip);
             this.Controls.Add(this.label4);
             this.Controls.Add(this.textBox1);
@@ -189,5 +213,7 @@
         private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.NumericUpDown InitialBytesToStrip;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button buttonDtu;
+        private System.Windows.Forms.Button buttonWater2;
     }
 }

DotNettyFrom/dialog/TcpPkgConfigDialog.cs

@@ -35,5 +35,21 @@ namespace DotNettyFrom.dialog
 
             this.Close();
         }
+
+        private void buttonWater2_Click(object sender, EventArgs e)
+        {
+            LengthFieldOffset.Value = 10;
+            LengthFieldLength.Value = 1;
+            LengthAdjustment.Value = 2;
+            InitialBytesToStrip.Value = 0;
+        }
+
+        private void buttonDtu_Click(object sender, EventArgs e)
+        {
+            LengthFieldOffset.Value = 10;
+            LengthFieldLength.Value = 2;
+            LengthAdjustment.Value = 1;
+            InitialBytesToStrip.Value = 0;
+        }
     }
 }

DotNettyFrom/form/ItemEditorForm.Designer.cs

@@ -59,6 +59,8 @@
             this.label3 = new System.Windows.Forms.Label();
             this.CBLenUnFix = new System.Windows.Forms.CheckBox();
             this.CBUnCheckUD = new System.Windows.Forms.CheckBox();
+            this.CbProtocolNo = new System.Windows.Forms.ComboBox();
+            this.label12 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // label1
@@ -81,7 +83,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(207, 32);
+            this.label2.Location = new System.Drawing.Point(303, 32);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(46, 17);
             this.label2.TabIndex = 2;
@@ -89,7 +91,7 @@
             // 
             // TbItemId
             // 
-            this.TbItemId.Location = new System.Drawing.Point(276, 29);
+            this.TbItemId.Location = new System.Drawing.Point(355, 29);
             this.TbItemId.Name = "TbItemId";
             this.TbItemId.Size = new System.Drawing.Size(121, 23);
             this.TbItemId.TabIndex = 3;
@@ -97,7 +99,7 @@
             // 
             // TbitemId2
             // 
-            this.TbitemId2.Location = new System.Drawing.Point(501, 29);
+            this.TbitemId2.Location = new System.Drawing.Point(544, 29);
             this.TbitemId2.Name = "TbitemId2";
             this.TbitemId2.ReadOnly = true;
             this.TbitemId2.Size = new System.Drawing.Size(121, 23);
@@ -303,7 +305,7 @@
             this.CBInputType.Items.AddRange(new object[] {
             "10进制",
             "16进制"});
-            this.CBInputType.Location = new System.Drawing.Point(50, 29);
+            this.CBInputType.Location = new System.Drawing.Point(176, 29);
             this.CBInputType.Name = "CBInputType";
             this.CBInputType.Size = new System.Drawing.Size(121, 25);
             this.CBInputType.TabIndex = 26;
@@ -312,7 +314,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(419, 32);
+            this.label3.Location = new System.Drawing.Point(482, 32);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(56, 17);
             this.label3.TabIndex = 4;
@@ -342,12 +344,37 @@
             this.CBUnCheckUD.Text = "是否检查长度与默认值";
             this.CBUnCheckUD.UseVisualStyleBackColor = true;
             // 
+            // CbProtocolNo
+            // 
+            this.CbProtocolNo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CbProtocolNo.Enabled = false;
+            this.CbProtocolNo.FormattingEnabled = true;
+            this.CbProtocolNo.Items.AddRange(new object[] {
+            "Dtu",
+            "Water2"});
+            this.CbProtocolNo.Location = new System.Drawing.Point(47, 29);
+            this.CbProtocolNo.Name = "CbProtocolNo";
+            this.CbProtocolNo.Size = new System.Drawing.Size(121, 25);
+            this.CbProtocolNo.TabIndex = 29;
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.ForeColor = System.Drawing.Color.DarkRed;
+            this.label12.Location = new System.Drawing.Point(12, 397);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(295, 17);
+            this.label12.TabIndex = 30;
+            this.label12.Text = "如果是水协议,写操作时,备注必须要写读的my_index值";
+            // 
             // ItemEditorForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.BtnCancle;
             this.ClientSize = new System.Drawing.Size(677, 432);
+            this.Controls.Add(this.label12);
+            this.Controls.Add(this.CbProtocolNo);
             this.Controls.Add(this.CBUnCheckUD);
             this.Controls.Add(this.CBLenUnFix);
             this.Controls.Add(this.CBInputType);
@@ -428,5 +455,7 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.CheckBox CBLenUnFix;
         private System.Windows.Forms.CheckBox CBUnCheckUD;
+        private System.Windows.Forms.ComboBox CbProtocolNo;
+        private System.Windows.Forms.Label label12;
     }
 }

DotNettyFrom/form/ItemEditorForm.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using DotNettyFrom.config;
 using DotNettyFrom.db;
 using DotNettyFrom.model;
 using DotNettyFrom.util;
@@ -21,6 +22,8 @@ namespace DotNettyFrom.form
         private string _id;
         private bool _isAdd = true; //true-add
 
+        private int len = 4;
+
         public ItemEditorForm(string id = null)
         {
             this._id = id;
@@ -30,6 +33,17 @@ namespace DotNettyFrom.form
         private void ItemEditorForm_Load(object sender, EventArgs e)
         {
             CBInputType.SelectedIndex = 0;
+            CbProtocolNo.SelectedIndex = SystemConfig.CurrentType - 1;
+
+
+            if (SystemConfig.CurrentType == SystemConfig.Dtu)
+            {
+                len = 4;
+            }
+            else if (SystemConfig.CurrentType == SystemConfig.Water2)
+            {
+                len = 2;
+            }
 
             if (_id != null)
             {
@@ -48,12 +62,18 @@ namespace DotNettyFrom.form
 
         private void UpdateOption(int id)
         {
-         
             BtnOp.Text = "修改";
             WvBean wb = DbHelper.GetInstance().SelectOneCmdById(id);
+            if (wb == null)
+            {
+                MessageBox.Show("出错,数据库找不到.id = " + id);
+                this.Close();
+            }
             this.Text = "修改ID - " + wb.id;
             _isAdd = false;
 
+            CbProtocolNo.SelectedIndex = wb.protocolNo - 1;
+
             TbItemId.Enabled = false;
             CBInputType.Enabled = false;
 
@@ -87,7 +107,6 @@ namespace DotNettyFrom.form
 
         private void CBInputType_SelectedIndexChanged(object sender, EventArgs e)
         {
-            Console.WriteLine(CBInputType.SelectedIndex);
         }
 
         private void TbItemId_TextChanged(object sender, EventArgs e)
@@ -98,7 +117,6 @@ namespace DotNettyFrom.form
                 TbitemId2.Text = "";
                 return;
             }
-
             if (CBInputType.SelectedIndex == 0)
             {
                 //10 ->16
@@ -106,7 +124,7 @@ namespace DotNettyFrom.form
                 try
                 {
                     int _id = int.Parse(text);
-                    TbitemId2.Text = CmdUtil.FrontWithZero(CmdUtil.Dec2Hex(_id), 4);
+                    TbitemId2.Text = CmdUtil.FrontWithZero(CmdUtil.Dec2Hex(_id), len);
                     RtbInfo.Text = "";
                 }
                 catch (Exception esException)
@@ -245,6 +263,7 @@ namespace DotNettyFrom.form
             wb.defalutValue = defalutValueString;
             wb.userValue = userValueString;
             wb.remark = TbRemark.Text.Trim();
+            wb.protocolNo = CbProtocolNo.SelectedIndex + 1;
 
             #endregion
 

DotNettyFrom/form/ItemManagerForm.Designer.cs

@@ -58,7 +58,7 @@
             this.dataGridViewItem.ReadOnly = true;
             this.dataGridViewItem.RowTemplate.Height = 23;
             this.dataGridViewItem.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridViewItem.Size = new System.Drawing.Size(1130, 554);
+            this.dataGridViewItem.Size = new System.Drawing.Size(1211, 554);
             this.dataGridViewItem.TabIndex = 0;
             this.dataGridViewItem.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewItem_CellMouseClick);
             this.dataGridViewItem.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewItem_CellMouseDoubleClick);
@@ -139,6 +139,7 @@
             // 
             // BtnClose
             // 
+            this.BtnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.BtnClose.Location = new System.Drawing.Point(562, 35);
             this.BtnClose.Name = "BtnClose";
             this.BtnClose.Size = new System.Drawing.Size(75, 23);
@@ -187,7 +188,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.BtnClose;
-            this.ClientSize = new System.Drawing.Size(1158, 729);
+            this.ClientSize = new System.Drawing.Size(1239, 729);
             this.Controls.Add(this.RtbLogInfo);
             this.Controls.Add(this.TBInputFind);
             this.Controls.Add(this.label1);

DotNettyFrom/form/ItemManagerForm.cs

@@ -143,7 +143,7 @@ namespace DotNettyFrom.form
             if (dialogResult == DialogResult.OK)
             {
                 //
-                DbHelper.GetInstance().DeleteAllFwData();
+                DbHelper.GetInstance().DeleteAllData();
                 ReLoadDatatable();
             }
         }

DotNettyFrom/generatecmd/CmdGenetor.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using DotNetty.Handlers.Timeout;
+using DotNettyFrom.config;
 using DotNettyFrom.util;
 
 namespace DotNettyFrom.generatecmd
@@ -16,5 +17,22 @@ namespace DotNettyFrom.generatecmd
         public abstract string GetLoginCmd(string ccid);
 
         public abstract string GetHeartbeat();
+
+        public abstract string GetReplyCmd(string receiveCmd);
+
+
+        public int GetCmdId(string receiveCmd)
+        {
+            try
+            {
+                string cmdId = receiveCmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
+                return Utils.hexToTen(cmdId);
+            }
+            catch (Exception)
+            {
+            }
+            return int.MinValue;
+        }
+
     }
 }

DotNettyFrom/generatecmd/DtuCmdGenetor.cs

@@ -22,7 +22,12 @@ namespace DotNettyFrom.generatecmd
             //7e7e7e00000000000184000085
             string cmd = DeviceId + "840000";
             cmd = "7e7e7e" + CmdUtil.CalcCrcCode(cmd);
-            return cmd;
+            return cmd.ToUpper();
+        }
+
+        public override string GetReplyCmd(string receiveCmd)
+        {
+            throw new NotImplementedException();
         }
     }
 }

DotNettyFrom/generatecmd/Water2CmdGenetor.cs

@@ -3,6 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DotNettyFrom.config;
+using DotNettyFrom.db;
+using DotNettyFrom.model;
 using DotNettyFrom.util;
 
 namespace DotNettyFrom.generatecmd
@@ -18,7 +21,94 @@ namespace DotNettyFrom.generatecmd
         public override string GetHeartbeat()
         {
             string cmd = DeviceId + "03020001";
-            return "7e7e7e" + CmdUtil.CalcCrc16Code(cmd);
+            return "7e7e7e" + CmdUtil.CalcCrc16Code(cmd).ToUpper();
+        }
+
+        public override string GetReplyCmd(string receiveCmd)
+        {
+            int cmdId = GetCmdId(receiveCmd);
+
+
+            if (cmdId == int.MinValue)
+            {
+                return null;
+            }
+
+            WvBean wb = DbHelper.GetInstance().SelectOneCmdByIndex(cmdId);
+
+            if (wb == null)
+            {
+                return null;
+            }
+            int pos = SystemConfig.FunctionCodeStartPos + SystemConfig.FunctionCodeLength;
+
+            //前面的
+            string resp = receiveCmd.Substring(0, pos);
+            //消息长度
+            string msgLen = receiveCmd.Substring(pos, SystemConfig.LengthFieldLength * 2);
+            pos += SystemConfig.LengthFieldLength * 2;
+            //测量点&消息流水
+
+            int MeasureFlow = (SystemConfig.MeasurePointLen + SystemConfig.MessageFlowLen);
+            string msgFlow =
+                receiveCmd.Substring(pos, MeasureFlow * 2);
+
+            pos += MeasureFlow * 2;
+
+            Console.WriteLine(resp);
+            Console.WriteLine("长度:" + msgLen);
+            Console.WriteLine("消息流水:" + msgFlow);
+            string bodyFrame = "";
+
+            if (!wb.remark.Trim().Equals(""))
+            {
+                //写
+                try
+                {
+                    int updateId = int.Parse(wb.remark.Trim());
+                    int msgLenTen = Utils.hexToTen(msgLen) - MeasureFlow;
+
+                    string content = receiveCmd.Substring(pos, msgLenTen * 2);
+
+
+                    Console.WriteLine("updateId:" + updateId + ";;" + msgLenTen);
+                    Console.WriteLine("Conte=" + content);
+                    WvBean updateBean = DbHelper.GetInstance().SelectOneCmdByIndex(updateId);
+                    if (updateBean != null)
+                    {
+                        updateBean.userValue = content;
+                        int result = DbHelper.GetInstance().UpdateCmd(updateBean);
+                        if (result > 0)
+                        {
+                            bodyFrame = "03" + msgFlow + "00";
+                        }
+                        else
+                        {
+                            bodyFrame = "03" + msgFlow + "01";
+                        }
+                    }
+                    
+                }
+                catch (Exception exception)
+                {
+                    bodyFrame = "03" + msgFlow + "01";
+                    Console.WriteLine(exception.Message);
+                    Console.WriteLine(exception);
+                }
+            }
+            else
+            {
+                //读
+                Console.WriteLine(wb.userValue);
+            }
+
+
+            return null;
+        }
+
+        private string GetFrontFrame(string cmd)
+        {
+            return cmd.Substring(0, SystemConfig.FunctionCodeLength + SystemConfig.FunctionCodeStartPos);
         }
     }
 }

DotNettyFrom/model/WvBean.cs

@@ -18,13 +18,23 @@ namespace DotNettyFrom.model
         public string remark = "";
         public string defalutValue = "";
         public string userValue = "";
+        public int protocolNo;
 
         public override string ToString()
         {
-            return "{\"index\":\"" + index + "\",\"myId\":\"" + myId + "\",\"idInfo\":\"" + idInfo + "\",\"len\":\"" +
-                   len + "\","
-                   + "\"mode\":\"" + mode + "\",\"desp\":\"" + desp + "\",\"remark\":\""
-                   + "\"}";
+            return "IssuedCmdDataTest{" +
+                   "id=" + id +
+                   ", index=" + index +
+                   ", myId='" + myId + '\'' +
+                   ", idInfo='" + idInfo + '\'' +
+                   ", len='" + len + '\'' +
+                   ", mode='" + mode + '\'' +
+                   ", desp='" + desp + '\'' +
+                   ", remark='" + remark + '\'' +
+                   ", defalutValue='" + defalutValue + '\'' +
+                   ", userValue='" + userValue + '\'' +
+                   ", protocolNo=" + protocolNo +
+                   '}';
         }
     }
 

DotNettyFrom/netty/NettyClient.cs

@@ -45,11 +45,11 @@ namespace DotNettyFrom.netty
                 .Handler(new ActionChannelInitializer<ISocketChannel>(channel =>
                 {
                     IChannelPipeline pipeline = channel.Pipeline;
-                    /*pipeline.AddLast(new LengthFieldBasedFrameDecoder(ushort.MaxValue,
+                    pipeline.AddLast(new LengthFieldBasedFrameDecoder(ushort.MaxValue,
                         SystemConfig.LengthFieldOffset,
                         SystemConfig.LengthFieldLength,
                         SystemConfig.LengthAdjustment,
-                        SystemConfig.InitialBytesToStrip));*/
+                        SystemConfig.InitialBytesToStrip));
                     pipeline.AddLast(new IdleStateHandler(SystemConfig.ReaderIdleTimeSeconds,
                         SystemConfig.WriterIdleTimeSeconds,
                         SystemConfig.AllIdleTimeSeconds));
@@ -125,6 +125,18 @@ namespace DotNettyFrom.netty
                 {
                     string recCmd = AryUtil.ByteBuffer2Hex(buffer);
                     DataModel.ReceCollection.Add(new UIInfoModel("收到", recCmd));
+                    Console.WriteLine("收到:" + recCmd);
+
+                    string cmd = CmdGenetor.Genetor?.GetReplyCmd(recCmd);
+                    if (cmd != null)
+                    {
+                        IByteBuffer replyBuffer = AryUtil.Hex2IByteBuffer(cmd);
+                        context.WriteAndFlushAsync(replyBuffer);
+                    }
+                    else
+                    {
+                        Console.WriteLine("reply is null");
+                    }
                 }
                 else
                 {
@@ -147,7 +159,11 @@ namespace DotNettyFrom.netty
                     {
                         string hb = CmdGenetor.Genetor.GetHeartbeat();
                         context.Channel.WriteAndFlushAsync(AryUtil.Hex2IByteBuffer(hb));
-                        DataModel.ReceCollection.Add(new UIInfoModel("发送", hb).setSendType(SystemConfig.SendType));
+                        Console.WriteLine("发心跳:" + hb + ".log=" + SystemConfig.IsLogHeartBeatInfo);
+                        if (SystemConfig.IsLogHeartBeatInfo)
+                        {
+                            DataModel.ReceCollection.Add(new UIInfoModel("发送", hb).setSendType(SystemConfig.SendType));
+                        }
                     }
                     else
                     {

DotNettyFrom/packages.config

@@ -11,6 +11,7 @@
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
+  <package id="NUnit" version="3.8.1" targetFramework="net461" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />

DotNettyFromTests/DotNettyFromTests.csproj

@@ -61,7 +61,9 @@
   <ItemGroup>
     <Compile Include="common\UIInfoModelTests.cs" />
     <Compile Include="generatecmd\CmdGenetorTests.cs" />
+    <Compile Include="generatecmd\Water2CmdGenetorTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTest1.cs" />
     <Compile Include="util\CmdUtilTests.cs" />
   </ItemGroup>
   <ItemGroup>

DotNettyFromTests/UnitTest1.cs

@@ -0,0 +1,15 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace DotNettyFromTests
+{
+    [TestClass()]
+    public class UnitTest1
+    {
+        [TestMethod()]
+        public void TestMethod1()
+        {
+            Console.WriteLine("--------------------");
+        }
+    }
+}

DotNettyFromTests/generatecmd/CmdGenetorTests.cs

@@ -21,9 +21,9 @@ namespace DotNettyFrom.generatecmd.Tests
         [TestMethod()]
         public void GetHeartbeatTest()
         {
-            CmdGenetor c = CmdGenetor.GetInstance().SetDeviceId("000000000002");
-            string cmd = c.GetLoginCmd("3839383630324731313931353530333339393137");
-            Console.WriteLine(cmd);
+            
+
+
         }
     }
 }

DotNettyFromTests/generatecmd/Water2CmdGenetorTests.cs

@@ -0,0 +1,28 @@
+using System;
+using DotNettyFrom.config;
+using DotNettyFrom.db;
+using DotNettyFrom.generatecmd;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace DotNettyFromTests.generatecmd
+{
+    [TestClass()]
+    public class Water2CmdGenetorTests
+    {
+        [TestMethod]
+        public void GetReplyCmdTest()
+        {
+
+            Console.WriteLine("----------------");
+
+            DbHelper.Init(@"D:\CSharp\DotNettyFrom\DotNettyFrom\bin\Debug\DotNettyFrom.accdb");
+            ConfigChange.ChangeDevice(SystemConfig.Water2);
+            
+
+            Water2CmdGenetor genetor = new Water2CmdGenetor();
+
+            genetor.GetReplyCmd("7e7e7e83a41e31f1f70f06018503e800645569");
+
+        }
+    }
+}