diff --git a/docs/资料/物联网中心/设备接入/飞比/飞比设备端点汇总.xlsx b/docs/资料/物联网中心/设备接入/飞比/飞比设备端点汇总.xlsx
new file mode 100644
index 00000000..a6f0762e
Binary files /dev/null and b/docs/资料/物联网中心/设备接入/飞比/飞比设备端点汇总.xlsx differ
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)