完善DTU部分

.gitignore

@@ -1,4 +1,5 @@
 .vs/*
+.idea/*
 packages/*
 DotNettyFromTests/obj/*
 DotNettyFromTests/bin/*

DotNettyFrom/DotNettyFrom.csproj

@@ -34,6 +34,9 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>DotNettyFrom.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetty.Buffers, Version=0.4.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetty.Buffers.0.4.6\lib\net45\DotNetty.Buffers.dll</HintPath>
@@ -241,5 +244,8 @@
   <ItemGroup>
     <Folder Include="cmdparser\" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="DotNettyFrom.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DotNettyFrom/MainForm.Designer.cs

@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.LBLogShow = new System.Windows.Forms.ListBox();
             this.ListBoxLogContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.LB_Context_CpCmd = new System.Windows.Forms.ToolStripMenuItem();
@@ -607,6 +608,7 @@
             this.Controls.Add(this.LBLogShow);
             this.Controls.Add(this.menuStrip1);
             this.Font = new System.Drawing.Font("微软雅黑", 8.5F);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "MainForm";

DotNettyFrom/MainForm.cs

@@ -51,14 +51,8 @@ namespace DotNettyFrom
 
             ChangeDtu();
 
-            if ("".Equals(TbDeviceId.Text.Trim()))
-            {
-                CmdGenetor.Genetor.DeviceId = "000000000001";
-            }
-            else
-            {
-                CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
-            }
+            TbDeviceId.Text = SystemConfig.DefaultNo;
+
 
             var consumer = Task.Factory.StartNew(() =>
             {
@@ -153,6 +147,9 @@ namespace DotNettyFrom
                 this.host = hostAddress.ToString();
                 this.port = int.Parse(TbPort.Text.Trim());
 
+                //设置地址
+                CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
+
                 UpdateUiComponent();
             }
             catch (SocketException exception)
@@ -176,10 +173,14 @@ namespace DotNettyFrom
             water2ToolStripMenuItem.Checked = true;
             CmdGenetor.Genetor = null;
             CmdGenetor.Genetor = new Water2CmdGenetor();
-
             ConfigChange.ChangeDevice(SystemConfig.Water2);
+            TbDeviceId.Text = SystemConfig.DefaultNo;
+            TbPort.Text = "" + SystemConfig.DefaultPort;
         }
 
+        /// <summary>
+        /// 记得Reload数据库
+        /// </summary>
         private void ChangeDtu()
         {
             this.Text = "模拟器-DTU";
@@ -188,6 +189,8 @@ namespace DotNettyFrom
             CmdGenetor.Genetor = null;
             CmdGenetor.Genetor = new DtuCmdGenetor();
             ConfigChange.ChangeDevice(SystemConfig.Dtu);
+            TbDeviceId.Text = SystemConfig.DefaultNo;
+            TbPort.Text = "" + SystemConfig.DefaultPort;
         }
 
         #region Component Event
@@ -196,7 +199,6 @@ namespace DotNettyFrom
         {
             BeforeConnection();
 
-            CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
             Task startNew = Task.Factory.StartNew(() =>
             {
                 _nettyClient = new NettyClient();
@@ -210,7 +212,6 @@ namespace DotNettyFrom
 
             Task startNew = Task.Factory.StartNew(() =>
             {
-                CmdGenetor.Genetor.DeviceId = TbDeviceId.Text.Trim();
                 string loginCmd = CmdGenetor.Genetor.GetLoginCmd(TbCCID.Text.Trim());
                 _nettyClient = new NettyClient();
                 _nettyClient.StartNetty(host, port, loginCmd);
@@ -381,7 +382,7 @@ namespace DotNettyFrom
             if (index >= 0 && index < LBLogShow.Items.Count)
             {
                 UIInfoModel uiInfoModel = LBLogShow.SelectedItem as UIInfoModel;
-                string line = uiInfoModel.ToString();
+                string line = uiInfoModel?.ToString();
                 if (!line.Trim().Equals(""))
                     Clipboard.SetDataObject(line);
             }
@@ -393,7 +394,7 @@ namespace DotNettyFrom
             if (index >= 0 && index < LBLogShow.Items.Count)
             {
                 UIInfoModel uiInfoModel = LBLogShow.SelectedItem as UIInfoModel;
-                string line = CmdUtil.FilterCmd(uiInfoModel.ToString());
+                string line = CmdUtil.FilterCmd(uiInfoModel?.ToString());
                 if (!line.Trim().Equals(""))
                 {
                 }
@@ -406,7 +407,7 @@ namespace DotNettyFrom
             if (index >= 0 && index < LBLogShow.Items.Count)
             {
                 UIInfoModel uiInfoModel = LBLogShow.SelectedItem as UIInfoModel;
-                string line = CmdUtil.FilterCmd(uiInfoModel.ToString());
+                string line = CmdUtil.FilterCmd(uiInfoModel?.ToString());
                 if (!line.Trim().Equals(""))
                 {
                 }

DotNettyFrom/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("DotNettyFrom")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Vcarecity")]
 [assembly: AssemblyProduct("DotNettyFrom")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]

DotNettyFrom/common/UIInfoModel..cs

@@ -75,7 +75,8 @@ namespace DotNettyFrom.common
             {
                 try
                 {
-                    string cmdIdString = cmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
+                    string cmdIdString = cmd.Substring(SystemConfig.FunctionCodeStartPos * 2,
+                        SystemConfig.FunctionCodeLength * 2);
                     res += ". cmdId=" + cmdIdString;
                     cmdId = CalcCmdId(cmd);
                 }
@@ -91,7 +92,8 @@ namespace DotNettyFrom.common
         {
             try
             {
-                string cmdId = cmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
+                string cmdId = cmd.Substring(SystemConfig.FunctionCodeStartPos * 2,
+                    SystemConfig.FunctionCodeLength * 2);
                 return int.Parse(cmdId);
             }
             catch (Exception)

DotNettyFrom/config/ConfigChange.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DotNettyFrom.db;
 
 namespace DotNettyFrom.config
 {
@@ -18,8 +19,6 @@ namespace DotNettyFrom.config
                 case SystemConfig.Water2:
                     changeWater2();
                     break;
-                default:
-                    break;
             }
         }
 
@@ -39,8 +38,15 @@ namespace DotNettyFrom.config
 
             SystemConfig.MeasurePointLen = Water2Config.MeasurePointLen;
             SystemConfig.MessageFlowLen = Water2Config.MessageFlowLen;
-      
-    }
+
+
+            SystemConfig.DefaultNo = Water2Config.DefaultWater2No;
+            SystemConfig.DefaultPort = Water2Config.DefaulWater2tPort;
+            
+            
+            
+            
+        }
 
         private static void changeDTU()
         {
@@ -58,6 +64,9 @@ namespace DotNettyFrom.config
 
             SystemConfig.MeasurePointLen = DtuConfig.MeasurePointLen;
             SystemConfig.MessageFlowLen = DtuConfig.MessageFlowLen;
+
+            SystemConfig.DefaultNo = DtuConfig.DefaultDtuNo;
+            SystemConfig.DefaultPort = DtuConfig.DefaulDtutPort;
         }
     }
 }

DotNettyFrom/config/DtuConfig.cs

@@ -8,9 +8,14 @@ namespace DotNettyFrom.config
 {
     public class DtuConfig
     {
+        public static string DefaultDtuNo = "000000000001";
+
+        public static int DefaulDtutPort = 15440;
+
         //功能码的位置,长度
-        public static int FunctionCodeStartPos = 18;
-        public static int FunctionCodeLength = 2;
+        public static int FunctionCodeStartPos = 9;
+
+        public static int FunctionCodeLength = 1;
 
 
         //心跳指令的功能码,用来判定是否是心跳

DotNettyFrom/config/SystemConfig.cs

@@ -14,6 +14,10 @@ namespace DotNettyFrom.config
         //当前是哪一个设备
         public static int CurrentType;
 
+        public static string DefaultNo = DtuConfig.DefaultDtuNo;
+        public static int DefaultPort = DtuConfig.DefaulDtutPort;
+
+
         //是否打印心跳指令
         public static bool IsLogHeartBeatInfo = false;
 
@@ -21,9 +25,9 @@ namespace DotNettyFrom.config
         public static int HeartbeatDownCmdCode = 4;
 
         //功能码的位置,长度
-        public static int FunctionCodeStartPos = 18;
+        public static int FunctionCodeStartPos = 9;
 
-        public static int FunctionCodeLength = 2;
+        public static int FunctionCodeLength = 1;
 
         //定时发送心中
         public static bool OpenHeartBeat = true;
@@ -37,12 +41,13 @@ namespace DotNettyFrom.config
 
         //测量点&消息流水
         public static int MeasurePointLen = 1;
-        public static int MessageFlowLen = 2;
 
+        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;
@@ -54,12 +59,14 @@ 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;
 
         //数据库对应
         public const int IpHisType = 1;
+
         public const int AddrHisType = 2;
         public const int SendHisType = 3;
         public const int CcidHisType = 4;

DotNettyFrom/config/Water2Config.cs

@@ -8,9 +8,13 @@ namespace DotNettyFrom.config
 {
     public class Water2Config
     {
+        public static string DefaultWater2No = "000000000002";
+
+        public static int DefaulWater2tPort = 15443;
+
         //功能码的位置,长度
-        public static int FunctionCodeStartPos = 18;
-        public static int FunctionCodeLength = 2;
+        public static int FunctionCodeStartPos = 9;
+        public static int FunctionCodeLength = 1;
 
         //心跳指令的功能码,用来判定是否是心跳
         public static int HeartbeatDownCmdCode = 3;

DotNettyFrom/db/DBHelper.cs

@@ -237,6 +237,32 @@ namespace DotNettyFrom.db
             }
         }
 
+        /// <summary>
+        /// 首次数据库加载到内存
+        /// </summary>
+        /// <param name="sql"></param>
+        public void ReloadMoneryCache(string sql = null)
+        {
+            if (sql == null)
+            {
+                string table = DBConfig.GetTableName();
+                sql = @"select * from " + table;
+            }
+            using (OleDbCommand sqlcmd = new OleDbCommand(sql, _DbConn))
+            {
+                using (OleDbDataReader reader = sqlcmd.ExecuteReader())
+                {
+                    while (reader != null && reader.Read()) //这个read调用很重要！不写的话运行时将提示找不到数据  
+                    {
+                        var myId = reader.GetString(2);
+                        var userValue = CheckUtil.StringIsEmpty(reader.GetString(8));
+                        if (!_idInfo.ContainsKey(myId))
+                            _idInfo.Add(myId, userValue);
+                    }
+                }
+            }
+        }
+
         //Select
         public DataTable SelectCmds(string sql = null)
         {

DotNettyFrom/form/ItemManagerForm.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.excel;
 using DotNettyFrom.model;
@@ -167,20 +168,21 @@ namespace DotNettyFrom.form
 //                名字 - IDInfo
 //                描述 - Desp
                 int mType = CbFindType.SelectedIndex;
+                string table = DBConfig.GetTableName();
                 string sql = "";
                 switch (mType)
                 {
                     case 0:
-                        sql = @"select* from fw where my_index = " + query;
+                        sql = @"select* from " + table + " where my_index = " + query;
                         break;
                     case 1:
-                        sql = @"select* from fw where MY_ID = '" + query + "'";
+                        sql = @"select* from " + table + " where MY_ID = '" + query + "'";
                         break;
                     case 2:
-                        sql = @"select* from fw where idInfo like '%" + query + "%'";
+                        sql = @"select* from " + table + " where idInfo like '%" + query + "%'";
                         break;
                     case 3:
-                        sql = @"select* from fw where desp like '%" + query + "%'";
+                        sql = @"select* from " + table + " where desp like '%" + query + "%'";
                         break;
                     default:
                         ReLoadDatatable();

DotNettyFrom/generatecmd/CmdGenetor.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using DotNetty.Handlers.Timeout;
 using DotNettyFrom.config;
 using DotNettyFrom.util;
+using NUnit.Framework;
 
 namespace DotNettyFrom.generatecmd
 {
@@ -25,7 +26,8 @@ namespace DotNettyFrom.generatecmd
         {
             try
             {
-                string cmdId = receiveCmd.Substring(SystemConfig.FunctionCodeStartPos, SystemConfig.FunctionCodeLength);
+                string cmdId = receiveCmd.Substring(2 * SystemConfig.FunctionCodeStartPos,
+                    2 * SystemConfig.FunctionCodeLength);
                 return Utils.hexToTen(cmdId);
             }
             catch (Exception)
@@ -33,6 +35,5 @@ namespace DotNettyFrom.generatecmd
             }
             return int.MinValue;
         }
-
     }
 }

DotNettyFrom/generatecmd/DtuCmdGenetor.cs

@@ -1,16 +1,28 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.AccessControl;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
+using DotNettyFrom.common;
+using DotNettyFrom.config;
+using DotNettyFrom.db;
 using DotNettyFrom.generatecmd;
+using DotNettyFrom.model;
 using DotNettyFrom.util;
 
 namespace DotNettyFrom.generatecmd
 {
     public class DtuCmdGenetor : CmdGenetor
     {
-        public override string GetLoginCmd( string ccid)
+        //ID LEN
+        private const int ID_LEN = 2;
+
+        private const int FUNC_REPLY_READ = 16; //要回复的功能码
+        private const int FUNC_REPLY_WRITE = 32; //要回复的功能码
+
+        public override string GetLoginCmd(string ccid)
         {
             string cmd = DeviceId + "820014" + ccid;
             cmd = "7e7e7e" + CmdUtil.CalcCrcCode(cmd);
@@ -27,7 +39,193 @@ namespace DotNettyFrom.generatecmd
 
         public override string GetReplyCmd(string receiveCmd)
         {
-            throw new NotImplementedException();
+            int cmdId = GetCmdId(receiveCmd);
+            Console.WriteLine("收到功能码=" + cmdId + " 16进制=" + Utils.tenToHex(cmdId));
+
+
+            //跳过心跳包
+            if (cmdId == SystemConfig.HeartbeatDownCmdCode)
+            {
+                if (SystemConfig.IsLogHeartBeatInfo)
+                {
+                    DataModel.ReceCollection.Add(new UIInfoModel("收到心跳", receiveCmd));
+                }
+                return null;
+            }
+
+            //处理其他的主动上报的回复
+
+
+            //处理其他的主动上报的回复
+
+
+            if (cmdId == int.MinValue)
+            {
+                DataModel.ReceCollection.Add(new UIInfoModel("帧错误", receiveCmd)
+                    .setAction(-1)
+                    .setSendType(SystemConfig.ReplyType));
+                return null;
+            }
+
+            int position = SystemConfig.FunctionCodeStartPos * 2;
+            //前面相同的, 到功能码前面
+            string resp = receiveCmd.Substring(0, position);
+            Console.WriteLine("前面回复相同的=" + resp);
+
+            position += SystemConfig.FunctionCodeLength * 2;
+
+            string frameDataLen = receiveCmd.Substring(position, SystemConfig.LengthFieldLength * 2);
+
+            //帧中定义的数据长度.10进制的
+            int frameDefineLen = Utils.hexToTen(frameDataLen);
+
+            Console.WriteLine("数据长度= " + frameDataLen + "  -- 10进制=" + Utils.hexToTen(frameDataLen));
+
+            position += SystemConfig.LengthFieldLength * 2;
+
+            //测量点&消息流水-所占长度
+            int msgFlowLength = SystemConfig.MeasurePointLen + SystemConfig.MessageFlowLen;
+
+            //测量点&消息流水
+            string msgFlow = receiveCmd.Substring(position, msgFlowLength * 2);
+            position += msgFlowLength * 2;
+            Console.WriteLine("测量点+消息流水=" + msgFlow);
+
+            string codeIdHex = receiveCmd.Substring(position, ID_LEN * 2);
+            int codeId = Utils.hexToTen(codeIdHex);
+            //0301 这些写死,2位
+            position += ID_LEN * 2;
+            Console.WriteLine("功能码=" + codeIdHex + "; 10进制=" + Utils.hexToTen(codeIdHex));
+
+
+            if (FUNC_REPLY_READ == cmdId)
+            {
+                DataModel.ReceCollection.Add(new UIInfoModel("收到读取", receiveCmd));
+
+                //读,回复
+                WvBean wb = DbHelper.GetInstance().SelectOneCmdByIndex(codeId);
+
+                if (wb == null)
+                {
+                    DataModel.ReceCollection.Add(
+                        new UIInfoModel(
+                                "读取-字典中不存在这个功能码=" + codeId + " 16进制=" + codeIdHex,
+                                receiveCmd)
+                            .setAction(-1)
+                            .setSendType(SystemConfig.ReplyType));
+                    return null;
+                }
+
+                string ud = wb.userValue;
+                Console.WriteLine(ud);
+                string lenMsgFlowData = ReadMessage(wb, msgFlow, codeIdHex);
+
+                int replyCmdId = cmdId + 128;
+                resp += CmdUtil.FrontWithZero(Utils.tenToHex(replyCmdId), SystemConfig.FunctionCodeLength * 2);
+                resp += lenMsgFlowData;
+                resp += CmdUtil.CalcCrcCodeSkip(resp, 3);
+
+                DataModel.ReceCollection.Add(
+                    new UIInfoModel("读取成功,回复", resp)
+                        .setAction(-1)
+                        .setSendType(SystemConfig.ReplyType));
+
+                return resp;
+            }
+            else if (FUNC_REPLY_WRITE == cmdId)
+            {
+                DataModel.ReceCollection.Add(new UIInfoModel("收到设置", receiveCmd));
+
+                //写
+                WvBean wb = DbHelper.GetInstance().SelectOneCmdByIndex(codeId);
+
+                if (wb == null)
+                {
+                    DataModel.ReceCollection.Add(
+                        new UIInfoModel(
+                                "设置-字典中不存在这个功能码=" + codeId + " 16进制=" + codeIdHex,
+                                receiveCmd)
+                            .setAction(-1)
+                            .setSendType(SystemConfig.ReplyType));
+                    return null;
+                }
+
+                //取出设置数据
+                Console.WriteLine("长度   " + (frameDefineLen - msgFlowLength - ID_LEN));
+                string setData = receiveCmd.Substring(position, 2 * (frameDefineLen - msgFlowLength - ID_LEN));
+
+                wb.userValue = setData;
+
+                string resultData = "";
+                string tip = "";
+                int result = DbHelper.GetInstance().UpdateCmd(wb);
+                if (result > 0)
+                {
+                    resultData = "00";
+                    tip = "设置成功,回复";
+                }
+                else
+                {
+                    resultData = "01";
+                    tip = "设置失败,回复";
+                }
+
+
+//                7E7E7E000000000001a000a1
+
+                int replyCmdId = cmdId + 128;
+                resp += CmdUtil.FrontWithZero(Utils.tenToHex(replyCmdId), SystemConfig.FunctionCodeLength * 2); //功能码
+
+                string replyData = msgFlow + codeIdHex + resultData;
+                if (replyData.Length % 2 != 0)
+                {
+                    replyData += "0";
+                }
+                //长度
+                string lenHex =
+                    CmdUtil.FrontWithZero(Utils.tenToHex(replyData.Length / 2), SystemConfig.LengthFieldLength * 2);
+                resp += lenHex;
+                resp += replyData; //消息体
+                resp += CmdUtil.CalcCrcCodeSkip(resp, 3);
+                DataModel.ReceCollection.Add(
+                    new UIInfoModel(tip + " set(" + codeIdHex + ")=value(" + setData + ")", resp)
+                        .setAction(-1)
+                        .setSendType(SystemConfig.ReplyType));
+
+                return resp;
+            }
+
+
+//            LengthAdjustment
+//            string codeData = receiveCmd.Substring(position, receiveCmd.Length - SystemConfig.LengthAdjustment * 2);
+//            Console.WriteLine("收到数量=" + codeData);
+
+            //处理主动上报的回复&心跳.那些不用回复
+
+            //处理主动上报的回复&心跳.那些不用回复
+
+
+//            WvBean wb = DbHelper.GetInstance().SelectOneCmdById(cmdId);
+//            Console.WriteLine(wb);
+
+            DataModel.ReceCollection.Add(new UIInfoModel("收到", receiveCmd));
+
+
+            return null;
+        }
+
+        private string ReadMessage(WvBean wb, string msgFlow, string codeIdHex)
+        {
+            string content = msgFlow + codeIdHex + wb.userValue.Trim();
+            if (content.Length % 2 != 0)
+            {
+                content = "0" + content;
+            }
+
+            string lenHex =
+                CmdUtil.FrontWithZero(Utils.tenToHex(content.Length / 2), SystemConfig.LengthFieldLength * 2);
+
+            return lenHex + content;
         }
     }
 }

DotNettyFrom/generatecmd/Water2CmdGenetor.cs

@@ -12,6 +12,9 @@ using NUnit.Framework;
 
 namespace DotNettyFrom.generatecmd
 {
+    /// <summary>
+    /// 不用缓存了,直接直接Select(查询)数据库
+    /// </summary>
     public class Water2CmdGenetor : CmdGenetor
     {
         public override string GetLoginCmd(string ccid)
@@ -30,13 +33,24 @@ namespace DotNettyFrom.generatecmd
         {
             //功能码
             int cmdId = GetCmdId(receiveCmd);
-
             Console.WriteLine("功能码=" + cmdId + "; 16=" + Utils.tenToHex(cmdId));
 
+
+            if (SystemConfig.HeartbeatDownCmdCode == cmdId)
+            {
+                if (SystemConfig.IsLogHeartBeatInfo)
+                {
+                    DataModel.ReceCollection.Add(new UIInfoModel("收到心跳", receiveCmd));
+                }
+                return null;
+            }
+
             //处理主动上报的回复&心跳.那些不用回复
 
             //处理主动上报的回复&心跳.那些不用回复
 
+            DataModel.ReceCollection.Add(new UIInfoModel("收到", receiveCmd));
+
 
             if (cmdId == int.MinValue)
             {
@@ -59,7 +73,7 @@ namespace DotNettyFrom.generatecmd
                 return null;
             }
 
-            int pos = SystemConfig.FunctionCodeStartPos + SystemConfig.FunctionCodeLength;
+            int pos = 2 * (SystemConfig.FunctionCodeStartPos + SystemConfig.FunctionCodeLength);
 
 
             //前面的,回复用的

DotNettyFrom/netty/NettyClient.cs

@@ -124,7 +124,7 @@ namespace DotNettyFrom.netty
                 if (message is IByteBuffer buffer)
                 {
                     string recCmd = AryUtil.ByteBuffer2Hex(buffer);
-                    DataModel.ReceCollection.Add(new UIInfoModel("收到", recCmd));
+
                     Console.WriteLine("收到:" + recCmd);
 
                     string cmd = CmdGenetor.Genetor?.GetReplyCmd(recCmd);
@@ -133,10 +133,6 @@ namespace DotNettyFrom.netty
                         IByteBuffer replyBuffer = AryUtil.Hex2IByteBuffer(cmd);
                         context.WriteAndFlushAsync(replyBuffer);
                     }
-                    else
-                    {
-                        Console.WriteLine("reply is null");
-                    }
                 }
                 else
                 {
@@ -159,15 +155,12 @@ namespace DotNettyFrom.netty
                     {
                         string hb = CmdGenetor.Genetor.GetHeartbeat();
                         context.Channel.WriteAndFlushAsync(AryUtil.Hex2IByteBuffer(hb));
-                        Console.WriteLine("发心跳:" + hb + ".log=" + SystemConfig.IsLogHeartBeatInfo);
+                        Console.WriteLine("发送心跳:" + hb + ".log=" + SystemConfig.IsLogHeartBeatInfo);
                         if (SystemConfig.IsLogHeartBeatInfo)
                         {
-                            DataModel.ReceCollection.Add(new UIInfoModel("发送", hb).setSendType(SystemConfig.SendType));
+                            DataModel.ReceCollection.Add(new UIInfoModel("发送心跳", hb).setSendType(SystemConfig.SendType));
                         }
                     }
-                    else
-                    {
-                    }
                 }
             }
 

DotNettyFrom/util/CmdUtil.cs

@@ -72,7 +72,7 @@ namespace DotNettyFrom.util
             }
 
             int result = 0;
-            for (int i = 0; i < list.Count(); i++)
+            for (int i = 0; i < list.Count; i++)
             {
                 result ^= Hex2Dec(list[i]);
             }
@@ -96,6 +96,24 @@ namespace DotNettyFrom.util
             return str + FrontWithZero(Dec2Hex(result), 2);
         }
 
+
+        public static string CalcCrcCodeSkip(string str, int skip)
+        {
+            List<string> list = new List<string>();
+            for (int i = 0; i < str.Length; i += 2)
+            {
+                list.Add(str.Substring(i, 2));
+            }
+
+            int result = 0;
+            for (int i = skip; i < list.Count; i++)
+            {
+                result ^= Hex2Dec(list[i]);
+            }
+            return FrontWithZero(Dec2Hex(result), 2);
+        }
+
+
         /// <summary>
         /// 只生成CRC16的校验码
         /// </summary>

DotNettyFromTests/DotNettyFromTests.csproj

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

DotNettyFromTests/generatecmd/DtuCmdGenetorTests.cs

@@ -0,0 +1,28 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using DotNettyFrom.generatecmd;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DotNettyFrom.db;
+using DotNettyFrom.config;
+
+namespace DotNettyFrom.generatecmd.Tests
+{
+    [TestClass()]
+    public class DtuCmdGenetorTests
+    {
+        [TestMethod()]
+        public void GetReplyCmdTest()
+        {
+
+            DbHelper.Init(@"D:\CSharp\DotNettyFrom\DotNettyFrom\bin\Debug\DotNettyFrom.accdb");
+            ConfigChange.ChangeDevice(SystemConfig.Dtu);
+
+            DtuCmdGenetor dtuCmd = new DtuCmdGenetor();
+            //dtuCmd.GetReplyCmd("7e7e7e000000000001100005010101031006");
+            dtuCmd.GetReplyCmd("7e7e7e00000000000120000801010103100101f4cf");
+        }
+    }
+}