Former-commit-id: be71155d542d858e7a6ae54f93c8f55097b237c0
TangShanKaiPing
wanggang 6 years ago
parent fb752089cb
commit 1edf3fd27c

@ -9,13 +9,14 @@ namespace Application.Domain.Entities
static DeviceId() 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 = 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 = 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 = 0x0106, Name = "光强检测器", Category = "监测", Icon = "light", 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 = 0x0163, Name = "红外遥控器", Category = "电器", Icon = "control", RawCategory = "wtf", EName = "wtf" });
List.Add(new DeviceId { RawDeviceId = 0x0309, Name = "粉尘检测器", Category = "监测", Icon = "socket", RawCategory = "HVAC", EName = "PM2.5 Sensor" }); List.Add(new DeviceId { RawDeviceId = 0x0202, Name = "窗帘", Category = "电器", Icon = "curtain", RawCategory = "Closures", EName = "Window Covering Device" });
List.Add(new DeviceId { RawDeviceId = 0x0402, Name = "报警器", Category = "监测", Icon = "socket", RawCategory = "Intruder Alarm Systems", EName = "IAS Zone" }); 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; } public string Name { get; set; }

@ -635,11 +635,8 @@ namespace FBeeService
{ {
Handle(sn, data.Skip(length).ToArray()); 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) private void HandleInternal(string sn, byte[] data)
{ {
@ -651,6 +648,7 @@ namespace FBeeService
} }
else if (responseType == ResponseType.x01) else if (responseType == ResponseType.x01)
{ {
//Console.WriteLine($"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
this.X01(sn, data); this.X01(sn, data);
} }
else if (responseType == ResponseType.x07) else if (responseType == ResponseType.x07)

Loading…
Cancel
Save