From d526963915902af1cf0755619b45ef01e96dd177 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 9 Apr 2019 18:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=94=B1=E4=BA=8E=E5=8A=9B?= =?UTF-8?q?=E5=88=9B=E4=B8=80=E6=AC=A1=E8=BF=94=E5=9B=9E=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../力创/命令文档整洁版.xlsx | Bin 13981 -> 13872 bytes .../IoT/IoT.Shared/Views/Home/Node.cshtml | 2 +- .../Infrastructure/DeviceService.cs | 35 ++++++++++++++---- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/资料/物联网中心/设备接入/力创/命令文档整洁版.xlsx b/docs/资料/物联网中心/设备接入/力创/命令文档整洁版.xlsx index 4e5fba88435d64b2a37ed10f25976223d4755560..cd4a64d8bb28e8e1b06eb1988ffe3615bc5e71cc 100644 GIT binary patch delta 6440 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 XVATjgBqe1rIU#0SZp#s#EHSV9G)lvY}#q*Gdi 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 SL -
+
开关 diff --git a/projects/IoT/IoTServices/LiChuangService/Infrastructure/DeviceService.cs b/projects/IoT/IoTServices/LiChuangService/Infrastructure/DeviceService.cs index 986e7425..87c1f02f 100644 --- a/projects/IoT/IoTServices/LiChuangService/Infrastructure/DeviceService.cs +++ b/projects/IoT/IoTServices/LiChuangService/Infrastructure/DeviceService.cs @@ -1,3 +1,7 @@ +using Infrastructure.Extensions; +using Infrastructure.Models; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using System; using System.Collections.Generic; using System.Linq; @@ -6,11 +10,6 @@ using System.Net.Sockets; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using Infrastructure.Extensions; -using Infrastructure.Models; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Polly; namespace LiChuangService { @@ -168,7 +167,14 @@ namespace LiChuangService var buffer = new byte[512]; var length = stream.Read(buffer); var data = buffer.ToList().Take(length).ToArray(); - this.Handle(data); + try + { + this.Handle(data); + } + catch (Exception ex) + { + ex.PrintStack(); + } } } }).Start(); @@ -187,13 +193,26 @@ namespace LiChuangService } private void Handle(byte[] data) + { + var list = new List(); + for (int i = 0; i < data.Length; i++) + { + if ((i + 3) < data.Length && data[i] == 0xfe && data[i + 1] == 0xa5) + { + var length = data[i + 3]; + this.HandleInternal(data.Skip(i).Take(5 + length).ToArray()); + } + } + } + + private void HandleInternal(byte[] data) { Console.WriteLine($"read:{BitConverter.ToString(data).Replace("-", " ")}"); var type = data[2]; var command = data[4]; if (command == 0x0c)//16位地址 { - this._address = data.ToList().Skip(5).Take(8).ToArray(); + this._address = this._address ?? data.ToList().Skip(5).Take(8).ToArray(); this._addressValue = BitConverter.ToString(this._address).Replace("-", ""); this.SearchNodeStatus(); } @@ -368,7 +387,7 @@ namespace LiChuangService private void Write(byte[] command) { - Thread.Sleep(200); + Thread.Sleep(500); Console.WriteLine($"write:{BitConverter.ToString(command).Replace("-", " ")}"); this._tcpClient.GetStream().Write(command); }