From 1edf3fd27cb70b93b585e66996f866940c20b701 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 26 Jun 2019 10:17:56 +0800 Subject: [PATCH] update Former-commit-id: be71155d542d858e7a6ae54f93c8f55097b237c0 --- .../飞比/飞比设备端点汇总.xlsx | Bin 0 -> 10260 bytes .../Application/Domain/Entities/DeviceId.cs | 11 ++++++----- .../FBeeService/Infrastructure/DeviceService.cs | 6 ++---- 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 docs/资料/物联网中心/设备接入/飞比/飞比设备端点汇总.xlsx diff --git a/docs/资料/物联网中心/设备接入/飞比/飞比设备端点汇总.xlsx b/docs/资料/物联网中心/设备接入/飞比/飞比设备端点汇总.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..a6f0762e647380f6c42bcad3bcb46f15e5abad95 GIT binary patch literal 10260 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 IlGk7V4=g;&q5uE@ literal 0 HcmV?d00001 diff --git a/projects/IoT/IoTServices/FBeeService/Application/Domain/Entities/DeviceId.cs b/projects/IoT/IoTServices/FBeeService/Application/Domain/Entities/DeviceId.cs index 243bfe01..d026fc1e 100644 --- a/projects/IoT/IoTServices/FBeeService/Application/Domain/Entities/DeviceId.cs +++ b/projects/IoT/IoTServices/FBeeService/Application/Domain/Entities/DeviceId.cs @@ -9,13 +9,14 @@ namespace Application.Domain.Entities static DeviceId() { - List.Add(new DeviceId { RawDeviceId = 0x0002, Name = "开关", Category = "电器", Icon = "socket", RawCategory = "Generic", EName = "On/Off Output" }); + List.Add(new DeviceId { RawDeviceId = 0x0002, Name = "开关", Category = "电器", Icon = "switch", RawCategory = "Generic", EName = "On/Off Output" }); List.Add(new DeviceId { RawDeviceId = 0x0009, Name = "插座", Category = "电器", Icon = "socket", RawCategory = "Generic", EName = "Mains Power Outlet" }); List.Add(new DeviceId { RawDeviceId = 0x0051, Name = "智能插座", Category = "电器", Icon = "socket", RawCategory = "Generic", EName = "Smart plug" }); - List.Add(new DeviceId { RawDeviceId = 0x0106, Name = "光强检测器", Category = "监测", Icon = "socket", RawCategory = "Lighting", EName = "Light Sensor" }); - List.Add(new DeviceId { RawDeviceId = 0x0202, Name = "一路可调窗帘", Category = "电器", Icon = "socket", RawCategory = "Closures", EName = "Window Covering Device" }); - List.Add(new DeviceId { RawDeviceId = 0x0309, Name = "粉尘检测器", Category = "监测", Icon = "socket", RawCategory = "HVAC", EName = "PM2.5 Sensor" }); - List.Add(new DeviceId { RawDeviceId = 0x0402, Name = "报警器", Category = "监测", Icon = "socket", RawCategory = "Intruder Alarm Systems", EName = "IAS Zone" }); + List.Add(new DeviceId { RawDeviceId = 0x0106, Name = "光强检测器", Category = "监测", Icon = "light", RawCategory = "Lighting", EName = "Light Sensor" }); + List.Add(new DeviceId { RawDeviceId = 0x0163, Name = "红外遥控器", Category = "电器", Icon = "control", RawCategory = "wtf", EName = "wtf" }); + List.Add(new DeviceId { RawDeviceId = 0x0202, Name = "窗帘", Category = "电器", Icon = "curtain", RawCategory = "Closures", EName = "Window Covering Device" }); + List.Add(new DeviceId { RawDeviceId = 0x0309, Name = "粉尘检测器", Category = "监测", Icon = "dust", RawCategory = "HVAC", EName = "PM2.5 Sensor" }); + List.Add(new DeviceId { RawDeviceId = 0x0402, Name = "报警器", Category = "安防", Icon = "alarm", RawCategory = "Intruder Alarm Systems", EName = "IAS Zone" }); } public string Name { get; set; } diff --git a/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs b/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs index 5324e3e0..aea46ee1 100644 --- a/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs +++ b/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs @@ -635,10 +635,7 @@ namespace FBeeService { Handle(sn, data.Skip(length).ToArray()); } - else - { - this.HandleInternal(sn, data.Take(length).ToArray()); - } + this.HandleInternal(sn, data.Take(length).ToArray()); } private void HandleInternal(string sn, byte[] data) @@ -651,6 +648,7 @@ namespace FBeeService } else if (responseType == ResponseType.x01) { + //Console.WriteLine($"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); this.X01(sn, data); } else if (responseType == ResponseType.x07)