完善水不设备&DB

DotNettyFrom.sln.DotSettings.user

@@ -1,5 +1,5 @@
 <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/ScopeCriterion/@EntryValue">+SNpzQIAAAD5I2nNAgAAAPkjac0CAAAAiWy6IfW9JyECAAAA0Q7cXB8AAABDAG8AbgB0AGkAbgB1AG8AdQBzAFQAZQBzAHQAaQBuAGcASABvAHMAdABQAHIAbwB2AGkAZABlAHIASQBkADCHYr8BAAAA5ZrClwYAAABNAFMAVABlAHMAdAAkAAAAQgBFADkAMwBFAEUAQwA2AC0ANQAzAEYAMwAtADQAMwBCADkALQBCADQAQgBCAC0AMgA5ADEAQwBEAEEARQA0ADYAMgA5ADAAHAAAAC4ATgBFAFQARgByAGEAbQBlAHcAbwByAGsALABWAGUAcgBzAGkAbwBuAD0AdgA0AC4ANgAuADEAJwAAAEQAbwB0AE4AZQB0AHQAeQBGAHIAbwBtAFQAZQBzAHQAcwAuAFUAbgBpAHQAVABlAHMAdAAxAC4AVABlAHMAdABNAGUAdABoAG8AZAAxAPW9JyECAAAA0Q7cXB8AAABDAG8AbgB0AGkAbgB1AG8AdQBzAFQAZQBzAHQAaQBuAGcASABvAHMAdABQAHIAbwB2AGkAZABlAHIASQBkADCHYr8BAAAA5ZrClwYAAABNAFMAVABlAHMAdAAkAAAAQgBFADkAMwBFAEUAQwA2AC0ANQAzAEYAMwAtADQAMwBCADkALQBCADQAQgBCAC0AMgA5ADEAQwBEAEEARQA0ADYAMgA5ADAAHAAAAC4ATgBFAFQARgByAGEAbQBlAHcAbwByAGsALABWAGUAcgBzAGkAbwBuAD0AdgA0AC4ANgAuADEAQwAAAEQAbwB0AE4AZQB0AHQAeQBGAHIAbwBtAFQAZQBzAHQAcwAuAGcAZQBuAGUAcgBhAHQAZQBjAG0AZAAuAFcAYQB0AGUAcgAyAEMAbQBkAEcAZQBuAGUAdABvAHIAVABlAHMAdABzAC4ARwBlAHQAUgBlAHAAbAB5AEMAbQBkAFQAZQBzAHQA9b0nIQIAAADRDtxcHwAAAEMAbwBuAHQAaQBuAHUAbwB1AHMAVABlAHMAdABpAG4AZwBIAG8AcwB0AFAAcgBvAHYAaQBkAGUAcgBJAGQAMIdivwEAAADlmsKXBgAAAE0AUwBUAGUAcwB0ACQAAABCAEUAOQAzAEUARQBDADYALQA1ADMARgAzAC0ANAAzAEIAOQAtAEIANABCAEIALQAyADkAMQBDAEQAQQBFADQANgAyADkAMAAcAAAALgBOAEUAVABGAHIAYQBtAGUAdwBvAHIAawAsAFYAZQByAHMAaQBvAG4APQB2ADQALgA2AC4AMQBDAAAARABvAHQATgBlAHQAdAB5AEYAcgBvAG0AVABlAHMAdABzAC4AZwBlAG4AZQByAGEAdABlAGMAbQBkAC4AVwBhAHQAZQByADIAQwBtAGQARwBlAG4AZQB0AG8AcgBUAGUAcwB0AHMALgBHAGUAdABSAGUAcABsAHkAQwBtAGQAVABlAHMAdAA=</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>
 	

DotNettyFrom/MainForm.Designer.cs

@@ -528,6 +528,7 @@
             this.BtnTest.TabIndex = 8;
             this.BtnTest.Text = "测试";
             this.BtnTest.UseVisualStyleBackColor = true;
+            this.BtnTest.Click += new System.EventHandler(this.BtnTest_Click);
             // 
             // BtnCmdManager
             // 

DotNettyFrom/MainForm.cs

@@ -28,7 +28,6 @@ namespace DotNettyFrom
         private NettyClient _nettyClient;
         private string host;
         private int port;
-        
 
         #endregion
 
@@ -124,7 +123,6 @@ namespace DotNettyFrom
 
             water2ToolStripMenuItem.Enabled = false;
             dtuToolStripMenuItem.Enabled = false;
-
         }
 
 
@@ -142,7 +140,6 @@ namespace DotNettyFrom
             BtnSendData.Enabled = false;
 
 
-
             water2ToolStripMenuItem.Enabled = true;
             dtuToolStripMenuItem.Enabled = true;
         }
@@ -342,6 +339,10 @@ namespace DotNettyFrom
                 }
                 else if (res.SendType == SystemConfig.ReplyType)
                 {
+                    Font f = new Font("微软雅黑", e.Font.Size);
+                    e.Graphics.DrawString(((ListBox) sender).Items[e.Index].ToString(), f,
+                        new SolidBrush(Color.BlueViolet),
+                        e.Bounds);
                 }
                 else
                 {
@@ -420,5 +421,15 @@ namespace DotNettyFrom
         {
             SystemConfig.IsLogHeartBeatInfo = LogHbtoolStripMenuItem.Checked;
         }
+
+        private void BtnTest_Click(object sender, EventArgs e)
+        {
+            Water2CmdGenetor w = new Water2CmdGenetor();
+            string reply = w.GetReplyCmd(TbSendData.Text.Trim());
+            if (reply != null)
+                Console.WriteLine("回复------:" + reply);
+            else
+                Console.WriteLine("resp is null");
+        }
     }
 }

DotNettyFrom/generatecmd/Water2CmdGenetor.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DotNettyFrom.common;
 using DotNettyFrom.config;
 using DotNettyFrom.db;
 using DotNettyFrom.model;
 using DotNettyFrom.util;
+using NUnit.Framework;
 
 namespace DotNettyFrom.generatecmd
 {
@@ -26,89 +28,143 @@ namespace DotNettyFrom.generatecmd
 
         public override string GetReplyCmd(string receiveCmd)
         {
+            //功能码
             int cmdId = GetCmdId(receiveCmd);
 
+            Console.WriteLine("功能码=" + cmdId + "; 16=" + Utils.tenToHex(cmdId));
+
+            //处理主动上报的回复&心跳.那些不用回复
+
+            //处理主动上报的回复&心跳.那些不用回复
+
 
             if (cmdId == int.MinValue)
             {
+                DataModel.ReceCollection.Add(new UIInfoModel("帧错误", receiveCmd)
+                    .setAction(-1)
+                    .setSendType(SystemConfig.ReplyType));
                 return null;
             }
 
+
             WvBean wb = DbHelper.GetInstance().SelectOneCmdByIndex(cmdId);
 
             if (wb == null)
             {
+                DataModel.ReceCollection.Add(
+                    new UIInfoModel("本地数据库没有这样的功能码=(" + cmdId + ") ;16进制=(" +
+                                    Utils.tenToHex(cmdId) + ")", receiveCmd)
+                        .setAction(-1)
+                        .setSendType(SystemConfig.ReplyType));
                 return null;
             }
+
             int pos = SystemConfig.FunctionCodeStartPos + SystemConfig.FunctionCodeLength;
 
-            //前面的
+
+            //前面的,回复用的
             string resp = receiveCmd.Substring(0, pos);
+
             //消息长度
-            string msgLen = receiveCmd.Substring(pos, SystemConfig.LengthFieldLength * 2);
+            int msgLen = Utils.hexToTen(receiveCmd.Substring(pos, SystemConfig.LengthFieldLength * 2));
             pos += SystemConfig.LengthFieldLength * 2;
-            //测量点&消息流水
 
-            int MeasureFlow = (SystemConfig.MeasurePointLen + SystemConfig.MessageFlowLen);
-            string msgFlow =
-                receiveCmd.Substring(pos, MeasureFlow * 2);
+            //测量点&消息流水
+            int msgFlowLength = (SystemConfig.MeasurePointLen + SystemConfig.MessageFlowLen);
+            string msgFlow = receiveCmd.Substring(pos, msgFlowLength * 2);
 
-            pos += MeasureFlow * 2;
+            pos += msgFlowLength * 2;
 
             Console.WriteLine(resp);
             Console.WriteLine("长度:" + msgLen);
             Console.WriteLine("消息流水:" + msgFlow);
             string bodyFrame = "";
 
-            if (!wb.remark.Trim().Equals(""))
+            string tip = "";
+            if (wb.mode.Trim().ToUpper().Equals("W"))
             {
-                //写
-                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);
-                }
+                bodyFrame = WriteMessage(receiveCmd, wb, cmdId, msgLen, msgFlow, msgFlowLength, pos);
+                tip = "设置回复";
             }
-            else
+            else if (wb.mode.Trim().ToUpper().Equals("R"))
             {
                 //读
-                Console.WriteLine(wb.userValue);
+                bodyFrame = ReadMessage(wb, msgFlow);
+                tip = "读取回复";
+            }
+            else
+            {
+                return null;
             }
 
 
-            return null;
+            resp += bodyFrame;
+            resp += CmdUtil.CalcCrc16CodeSkip(resp, 3);
+            Console.WriteLine("回复:" + resp);
+            DataModel.ReceCollection.Add(new UIInfoModel(tip, resp).setSendType(SystemConfig.SendType));
+            return resp;
+        }
+
+        private string ReadMessage(WvBean wb, string msgFlow)
+        {
+            string content = msgFlow + 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;
         }
 
-        private string GetFrontFrame(string cmd)
+        private string WriteMessage(string receiveCmd, WvBean wb, int funWord, int msgLen, string msgFlow,
+            int msgFlowLength, int pos)
         {
-            return cmd.Substring(0, SystemConfig.FunctionCodeLength + SystemConfig.FunctionCodeStartPos);
+            try
+            {
+                int contentLen = msgLen - msgFlowLength;
+                string content = receiveCmd.Substring(pos, contentLen * 2);
+                Console.WriteLine("下发的内容是:" + content);
+
+                int updateId = funWord;
+                if (!wb.remark.Trim().Equals(""))
+                {
+                    updateId = int.Parse(wb.remark.Trim());
+                }
+
+                Console.WriteLine("更新Id=" + updateId + ";内容长度=" + contentLen);
+                Console.WriteLine("内容=" + content);
+
+                WvBean updateBean = DbHelper.GetInstance().SelectOneCmdByIndex(updateId);
+                if (updateBean != null)
+                {
+                    updateBean.userValue = content;
+                    int result = DbHelper.GetInstance().UpdateCmd(updateBean);
+                    if (result > 0)
+                    {
+                        DataModel.ReceCollection.Add(
+                            new UIInfoModel("设置成功.更新=(" + updateId + ") ;16进制=(" +
+                                            Utils.tenToHex(updateId) + "); 内容=" + content)
+                                .setAction(-1)
+                                .setSendType(SystemConfig.ReplyType));
+                        return "03" + msgFlow + "00";
+                    }
+                }
+                //不存在这样的Key
+                DataModel.ReceCollection.Add(
+                    new UIInfoModel("设置失败.本地数据库没有这样的功能码=(" + updateId + ") ;16进制=(" +
+                                    Utils.tenToHex(updateId) + ")")
+                        .setAction(-1)
+                        .setSendType(SystemConfig.ReplyType));
+            }
+            catch (Exception exception)
+            {
+                DataModel.ReceCollection.Add(
+                    new UIInfoModel("设置数据时,出错." + exception.Message)
+                        .setAction(-1)
+                        .setSendType(SystemConfig.ReplyType));
+            }
+            return "03" + msgFlow + "01";
         }
     }
 }

DotNettyFrom/netty/NettyClient.cs

@@ -182,7 +182,7 @@ namespace DotNettyFrom.netty
             public override void ChannelInactive(IChannelHandlerContext context)
             {
                 base.ChannelInactive(context);
-                DataModel.ReceCollection.Add(new UIInfoModel("ChannelInactive:" + context.Channel)
+                DataModel.ReceCollection.Add(new UIInfoModel("ChannelInactive:" + context.Channel.RemoteAddress)
                     .setAction(2).setSendType(SystemConfig.DebugType));
             }
         }

DotNettyFrom/util/CmdUtil.cs

@@ -96,7 +96,11 @@ namespace DotNettyFrom.util
             return str + FrontWithZero(Dec2Hex(result), 2);
         }
 
-
+        /// <summary>
+        /// 只生成CRC16的校验码
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
         public static string CalcCrc16Code2(string str)
         {
             int value = crc16(HexUtil.hexToBytes(str));
@@ -104,7 +108,17 @@ namespace DotNettyFrom.util
             return FrontWithZero(Utils.tenToHex(value), 4);
         }
 
+        public static string CalcCrc16CodeSkip(string str, int skip)
+        {
+            return CalcCrc16Code2(str.Substring(skip * 2));
+        }
+
 
+        /// <summary>
+        /// 返回完整长度
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
         public static string CalcCrc16Code(string str)
         {
             int value = crc16(HexUtil.hexToBytes(str));