diff --git a/CPF_Cef/MainModel.cs b/CPF_Cef/MainModel.cs index 0ff5058..c5f0495 100644 --- a/CPF_Cef/MainModel.cs +++ b/CPF_Cef/MainModel.cs @@ -43,7 +43,8 @@ namespace AKS.EnterpriseLibrary.WebBrowser ws.OnMessage += (s, e) => { string content = Encoding.UTF8.GetString(e.Content); - if (content != "ping") + //读取参数 + if (content != "ping" && !string.IsNullOrEmpty(content)) { //返回内容 string result = string.Empty; @@ -140,6 +141,18 @@ namespace AKS.EnterpriseLibrary.WebBrowser byte[] bytes = SerializeContent(result); ws.Reply(s.ToString(), new SAEA.WebSocket.Model.WSProtocal(SAEA.WebSocket.Type.WSProtocalType.Text, bytes)); } + //监听心跳并且回复客户端“已ping作为关键字” + else if (content == "ping") + { + string result = "{\"keycode\":\"" + "hert" + "\",\"message\":\"seccse\",\"code\":\"200\",\"status\":true,\"data\":\"收到客户端心跳\"}"; + byte[] bytes = SerializeContent(result); + ws.Reply(s.ToString(), new SAEA.WebSocket.Model.WSProtocal(SAEA.WebSocket.Type.WSProtocalType.Text, bytes)); + } + else { + string result = "{\"keycode\":\"" + "hert" + "\",\"message\":\"seccse\",\"code\":\"200\",\"status\":true,\"data\":\"收到客户端心跳\"}"; + byte[] bytes = SerializeContent(result); + ws.Reply(s.ToString(), new SAEA.WebSocket.Model.WSProtocal(SAEA.WebSocket.Type.WSProtocalType.Text, bytes)); + } }; ws.OnDisconnected += (s) => { @@ -901,7 +914,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser if (jo["returnCode"].ToString() == "0") { string result = jo["data"].ToString(); - // Log.Info(result); + // Log.Info(result); JArray jo1 = (JArray)JsonConvert.DeserializeObject(result); string devidx = string.Empty; string name = string.Empty; @@ -909,14 +922,14 @@ namespace AKS.EnterpriseLibrary.WebBrowser { devidx = jo2["dev_idx"].ToString(); name = jo2["name"].ToString(); - // Log.Info(name); + // Log.Info(name); break; } return devidx; } else { - // Log.Info(jo["returnMsg"].ToString()); + // Log.Info(jo["returnMsg"].ToString()); return ""; } } @@ -957,7 +970,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser } else { - // Log.Info(jo["returnMsg"].ToString()); + // Log.Info(jo["returnMsg"].ToString()); return ""; } } @@ -992,7 +1005,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser } else { - // Log.Info(jo["returnMsg"].ToString()); + // Log.Info(jo["returnMsg"].ToString()); return ""; } } @@ -1025,7 +1038,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser } else { - // Log.Info(jo["returnMsg"].ToString()); + // Log.Info(jo["returnMsg"].ToString()); return ""; } } @@ -1062,7 +1075,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser } else { - // Log.Info(jo["returnMsg"].ToString()); + // Log.Info(jo["returnMsg"].ToString()); return ""; } } @@ -1099,7 +1112,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser } else { - // Log.Info(jo["returnMsg"].ToString()); + // Log.Info(jo["returnMsg"].ToString()); return ""; } } @@ -1330,7 +1343,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser "yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo); string dirpath = System.IO.Directory.GetCurrentDirectory(); dirpath = dirpath + @"/wwwroot/WavFile"; - // Log.Info(dirpath); + // Log.Info(dirpath); if (!Directory.Exists(dirpath)) { Directory.CreateDirectory(dirpath);