From a7f5aead331169e28adc6274d34e2f3966b2203a Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 22 Oct 2019 16:54:30 +0800
Subject: [PATCH] update

Former-commit-id: fa6b7f38bac00760d03318d380e8dc8283f41fd1
---
 projects/Infrastructure/Infrastructure.csproj |   2 +-
 .../Areas/Admin/Views/Home/Index.cshtml       |  40 ++++----
 projects/IoTCenter/Views/Home/Index.cshtml    |   6 +-
 projects/IoTCenter/Views/Home/Node.cshtml     |   3 +-
 projects/IoTCenter/wwwroot/node.html          |  43 +++++++++
 projects/IoTCenter/wwwroot/node.tangshan.html |   8 +-
 .../StreamingAssets/IoT.Resources.csproj      |   3 +
 .../StreamingAssets/wwwroot/images/lamp.png   | Bin 0 -> 2627 bytes
 .../Assets/StreamingAssets/wwwroot/index.html |  10 +-
 .../Controllers/FBee/ColorLightController.cs  |  77 +---------------
 .../Controllers/FBee/WarmLightController.cs   |  87 ++++++++++++++++++
 .../IoTNode/DeviceServices/FBee/DeviceId.cs   |   3 +-
 .../DeviceServices/FBee/FBeeService.cs        |   6 +-
 projects/IoTNode/Program.cs                   |   2 +
 14 files changed, 179 insertions(+), 111 deletions(-)
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/lamp.png
 create mode 100644 projects/IoTNode/Controllers/FBee/WarmLightController.cs

diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index f1ce6b9e..28d5daee 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="MailKit" Version="2.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-rc4" />
diff --git a/projects/IoTCenter/Areas/Admin/Views/Home/Index.cshtml b/projects/IoTCenter/Areas/Admin/Views/Home/Index.cshtml
index 9f7a7fec..c1f35897 100644
--- a/projects/IoTCenter/Areas/Admin/Views/Home/Index.cshtml
+++ b/projects/IoTCenter/Areas/Admin/Views/Home/Index.cshtml
@@ -4,26 +4,6 @@
     ViewData["IsHomePage"] = true;
     var max = env.IsDevelopment() ? 10 : 1;
 }
-<div class="row">
-    <div class="col-md-12"><div class="callout callout-success"><h4>节点</h4></div></div>
-    @for (int i = 0; i < max; i++)
-    {
-        foreach (var item in Model.Nodes)
-        {
-            <div class="col-md-2 col-xs-4">
-                <div class="box box-solid">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">@item.Name</h3>
-                        <div class="pull-right box-tools">设备：@item.DeviceCount </div>
-                    </div>
-                    <a class="box-body" href="@Url.Action("Index","Device",new { nodeId=item.Id})" style="display:block;text-align:center;">
-                        <img alt="@item.Name" src="@(item.Image??"/images/empty.png")" style="margin:0 auto;" />
-                    </a>
-                </div>
-            </div>
-        }
-    }
-</div>
 <div class="row">
     <div class="col-md-12"><div class="callout callout-success"><h4>分类</h4></div></div>
     @foreach (var item in Model.Categories)
@@ -57,4 +37,24 @@
             </div>
         </div>
     }
+</div>
+<div class="row">
+    <div class="col-md-12"><div class="callout callout-success"><h4>节点</h4></div></div>
+    @for (int i = 0; i < max; i++)
+    {
+        foreach (var item in Model.Nodes)
+        {
+            <div class="col-md-2 col-xs-4">
+                <div class="box box-solid">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">@item.Name</h3>
+                        <div class="pull-right box-tools">设备：@item.DeviceCount </div>
+                    </div>
+                    <a class="box-body" href="@Url.Action("Index","Device",new { nodeId=item.Id})" style="display:block;text-align:center;">
+                        <img alt="@item.Name" src="@(item.Image??"/images/empty.png")" style="margin:0 auto;" />
+                    </a>
+                </div>
+            </div>
+        }
+    }
 </div>
\ No newline at end of file
diff --git a/projects/IoTCenter/Views/Home/Index.cshtml b/projects/IoTCenter/Views/Home/Index.cshtml
index de84629f..05056590 100644
--- a/projects/IoTCenter/Views/Home/Index.cshtml
+++ b/projects/IoTCenter/Views/Home/Index.cshtml
@@ -22,8 +22,8 @@
     <link rel="stylesheet" href="~/css/site.css">
     <title>@HtmlTitle | @cfg["name"]</title>
 </head>
-<body class="hold-transition skin-blue-light layout-top-nav">
-    <div class="wrapper overlay-wrapper">
+<body class="hold-transition skin-blue-light layout-top-nav fixed">
+    <div class="wrapper">
         <header class="main-header">
             <nav class="navbar navbar-static-top">
                 <div class="container">
@@ -33,6 +33,8 @@
                             <i class="fa fa-bars"></i>
                         </button>
                     </div>
+                    <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                    </div>
                     <div class="navbar-custom-menu">
                         @if (User.Identity.IsAuthenticated)
                         {
diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index ac6054d1..cd0e99d3 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -1,5 +1,4 @@
-@model string
-@inject IConfiguration cfg
+@inject IConfiguration cfg
 @{
     Layout = null;
 }
diff --git a/projects/IoTCenter/wwwroot/node.html b/projects/IoTCenter/wwwroot/node.html
index cab4c1bd..80c46d66 100644
--- a/projects/IoTCenter/wwwroot/node.html
+++ b/projects/IoTCenter/wwwroot/node.html
@@ -198,6 +198,48 @@
                 </div>
             </div>
         </template>
+        <template v-for="device in GetDevices('色暖灯')">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="box box-solid btns">
+                        <div class="box-header with-border">
+                            <h3 class="box-title"><img src="/images/light2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                            <div class="box-tools pull-right">
+                                <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/WarmLight/Off')" src="/images/on.png" />
+                                <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/WarmLight/On')" src="/images/off.png" />
+                            </div>
+                        </div>
+                        <div class="box-body" style="height:178px;">
+                            <form method="get" action="/App/ExecApi">
+                                <input type="hidden" name="Number" :value="device.Number" />
+                                <input type="hidden" name="Method" value="/WarmLight/SetBrightness" />
+                                <div class="row">
+                                    <div class="col-md-2 col-xs-4">
+                                        <span class="label1">亮度</span>
+                                    </div>
+                                    <div class="col-md-10 col-xs-8">
+                                        <input @change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
+                                    </div>
+                                </div>
+                            </form>
+                            <form method="get" action="/App/ExecApi">
+                                <input type="hidden" name="Number" :value="device.Number" />
+                                <input type="hidden" name="Method" value="/WarmLight/SetColor" />
+                                <input type="hidden" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
+                                <div class="row">
+                                    <div class="col-md-2 col-xs-4">
+                                        <span class="label1">色调</span>
+                                    </div>
+                                    <div class="col-md-10 col-xs-8">
+                                        <input @change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
 
         <template v-for="device in GetDevices('调色灯')">
             <div class="row">
@@ -248,6 +290,7 @@
                 </div>
             </div>
         </template>
+
         <template v-for="device in GetDevices('红外转发器')">
             <div class="row">
                 <div class="col-md-12">
diff --git a/projects/IoTCenter/wwwroot/node.tangshan.html b/projects/IoTCenter/wwwroot/node.tangshan.html
index 27ca6282..9977cba3 100644
--- a/projects/IoTCenter/wwwroot/node.tangshan.html
+++ b/projects/IoTCenter/wwwroot/node.tangshan.html
@@ -371,14 +371,14 @@
                 <div class="box-header with-border">
                     <h3 class="box-title"><img src="/images/light2.png" style="height:18px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                     <div class="box-tools pull-right">
-                        <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/ColorLight/Off')" src="/images/on.png" />
-                        <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/ColorLight/On')" src="/images/off.png" />
+                        <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/WarmLight/Off')" src="/images/on.png" />
+                        <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/WarmLight/On')" src="/images/off.png" />
                     </div>
                 </div>
                 <div class="box-body">
                     <form method="get" action="/App/Exec">
                         <input type="hidden" name="Number" :value="device.Number" />
-                        <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
+                        <input type="hidden" name="Method" value="/WarmLight/SetBrightness" />
                         <div class="row">
                             <div class="col-md-3">
                                 <span class="label1">亮度</span>
@@ -390,7 +390,7 @@
                     </form>
                     <form method="get" action="/App/Exec">
                         <input type="hidden" name="Number" :value="device.Number" />
-                        <input type="hidden" name="Method" value="/ColorLight/SetColor" />
+                        <input type="hidden" name="Method" value="/WarmLight/SetColor" />
                         <div class="row">
                             <div class="col-md-3">
                                 <span class="label1">色调</span>
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index 9139d5c3..2f7ca65b 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -12,4 +12,7 @@
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="wwwroot\images\lamp.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/lamp.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/lamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4a69f74068428c8fe8a249eb9779f5f8612871
GIT binary patch
literal 2627
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

literal 0
HcmV?d00001

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
index 7311df5e..b541e5a2 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@@ -494,15 +494,15 @@
                                 </ul>
                             </div>
                             <div class="row">
-                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/ColorLight/On')" v-if="getData(device,'状态')==='关'">开</a>
-                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/ColorLight/Off')" v-else>关</a>
+                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/WarmLight/On')" v-if="getData(device,'状态')==='关'">开</a>
+                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/WarmLight/Off')" v-else>关</a>
                             </div>
                             <div class="row">
                                 <form class="ajax" method="get" :action="'http://'+vm.Login.Host+'/IoTCenter/App/Exec'">
                                     <input type="hidden" name="ConnectionId" :value="vm.ConnectionId" />
                                     <input type="hidden" name="Gateway" :value="device.GatewayNumber" />
                                     <input type="hidden" name="Number" :value="device.Number" />
-                                    <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
+                                    <input type="hidden" name="Method" value="/WarmLight/SetBrightness" />
                                     <div class="list inline-labels no-hairlines-md">
                                         <ul>
                                             <li class="item-content item-input">
@@ -525,7 +525,7 @@
                                     <input type="hidden" name="ConnectionId" :value="vm.ConnectionId" />
                                     <input type="hidden" name="Gateway" :value="device.GatewayNumber" />
                                     <input type="hidden" name="Number" :value="device.Number" />
-                                    <input type="hidden" name="Method" value="/ColorLight/SetColor" />
+                                    <input type="hidden" name="Method" value="/WarmLight/SetColor" />
                                     <div class="list inline-labels no-hairlines-md">
                                         <ul>
                                             <li class="item-content item-input">
@@ -559,7 +559,7 @@
                                     <input type="hidden" name="ConnectionId" :value="vm.ConnectionId" />
                                     <input type="hidden" name="Gateway" :value="device.GatewayNumber" />
                                     <input type="hidden" name="Number" :value="device.Number" />
-                                    <input type="hidden" name="Method" value="/ColorLight/SetColorTemperature" />
+                                    <input type="hidden" name="Method" value="/WarmLight/SetColorTemperature" />
                                     <div class="list inline-labels no-hairlines-md">
                                         <ul>
                                             <li class="item-content item-input">
diff --git a/projects/IoTNode/Controllers/FBee/ColorLightController.cs b/projects/IoTNode/Controllers/FBee/ColorLightController.cs
index 31abebc7..2f2019a2 100644
--- a/projects/IoTNode/Controllers/FBee/ColorLightController.cs
+++ b/projects/IoTNode/Controllers/FBee/ColorLightController.cs
@@ -1,87 +1,14 @@
-using Application.Models;
-using Infrastructure.Extensions;
-using IoTNode.DeviceServices.FBee;
-using Microsoft.AspNetCore.Mvc;
+using IoTNode.DeviceServices.FBee;
 using Swashbuckle.AspNetCore.Annotations;
 using System;
-using System.ComponentModel.DataAnnotations;
 
 namespace IoTNode.Controllers
 {
     [SwaggerTag("调色灯")]
-    public class ColorLightController : SwitchController
+    public class ColorLightController : WarmLightController
     {
-        internal readonly FBeeService _deviceService;
-
         public ColorLightController(IServiceProvider applicationServices, FBeeService deviceService) : base(applicationServices, deviceService)
         {
-            this._deviceService = deviceService;
-        }
-
-        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("亮度")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
-        public ApiResponse SetBrightness([SwaggerParameter("设备编号")]string number, [SwaggerParameter("亮度")][Range(0, 255)]int brightness)
-        {
-            if (number is null)
-            {
-                throw new ArgumentNullException(nameof(number));
-            }
-
-            try
-            {
-                var values = number.Split('-');
-                this._deviceService.X83(values[0], values[1], (byte)brightness);
-            }
-            catch (Exception ex)
-            {
-                ex.PrintStack();
-                return ApiResponse.Error(ex.Message);
-            }
-            return ApiResponse.AsyncSuccess();
-        }
-
-        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("色度")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
-        public ApiResponse SetColor([SwaggerParameter("设备编号")]string number, [SwaggerParameter("色调")][Range(0, 255)]int hue, [SwaggerParameter("饱和度")][Range(0, 255)]int saturation)
-        {
-            if (number is null)
-            {
-                throw new ArgumentNullException(nameof(number));
-            }
-
-            try
-            {
-                var values = number.Split('-');
-                this._deviceService.X84(values[0], values[1], (byte)hue, (byte)saturation);
-            }
-            catch (Exception ex)
-            {
-                ex.PrintStack();
-                return ApiResponse.Error(ex.Message);
-            }
-            return ApiResponse.AsyncSuccess();
-        }
-
-        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("色温")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
-        public ApiResponse SetColorTemperature([SwaggerParameter("设备编号")]string number, [SwaggerParameter("色温")][Range(2700, 6500)]int colorTemperature)
-        {
-            if (number is null)
-            {
-                throw new ArgumentNullException(nameof(number));
-            }
-
-            try
-            {
-                var values = number.Split('-');
-                this._deviceService.XA8(values[0], values[1], (ushort)colorTemperature);
-            }
-            catch (Exception ex)
-            {
-                ex.PrintStack();
-                return ApiResponse.Error(ex.Message);
-            }
-            return ApiResponse.AsyncSuccess();
         }
     }
 }
\ No newline at end of file
diff --git a/projects/IoTNode/Controllers/FBee/WarmLightController.cs b/projects/IoTNode/Controllers/FBee/WarmLightController.cs
new file mode 100644
index 00000000..9b387ffd
--- /dev/null
+++ b/projects/IoTNode/Controllers/FBee/WarmLightController.cs
@@ -0,0 +1,87 @@
+using Application.Models;
+using Infrastructure.Extensions;
+using IoTNode.DeviceServices.FBee;
+using Microsoft.AspNetCore.Mvc;
+using Swashbuckle.AspNetCore.Annotations;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace IoTNode.Controllers
+{
+    [SwaggerTag("色暖灯")]
+    public class WarmLightController : SwitchController
+    {
+        internal readonly FBeeService _deviceService;
+
+        public WarmLightController(IServiceProvider applicationServices, FBeeService deviceService) : base(applicationServices, deviceService)
+        {
+            this._deviceService = deviceService;
+        }
+
+        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("亮度")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
+        public ApiResponse SetBrightness([SwaggerParameter("设备编号")]string number, [SwaggerParameter("亮度")][Range(0, 255)]int brightness)
+        {
+            if (number is null)
+            {
+                throw new ArgumentNullException(nameof(number));
+            }
+
+            try
+            {
+                var values = number.Split('-');
+                this._deviceService.X83(values[0], values[1], (byte)brightness);
+            }
+            catch (Exception ex)
+            {
+                ex.PrintStack();
+                return ApiResponse.Error(ex.Message);
+            }
+            return ApiResponse.AsyncSuccess();
+        }
+
+        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("色度")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
+        public ApiResponse SetColor([SwaggerParameter("设备编号")]string number, [SwaggerParameter("色调")][Range(0, 255)]int hue, [SwaggerParameter("饱和度")][Range(0, 255)]int saturation)
+        {
+            if (number is null)
+            {
+                throw new ArgumentNullException(nameof(number));
+            }
+
+            try
+            {
+                var values = number.Split('-');
+                this._deviceService.X84(values[0], values[1], (byte)hue, (byte)saturation);
+            }
+            catch (Exception ex)
+            {
+                ex.PrintStack();
+                return ApiResponse.Error(ex.Message);
+            }
+            return ApiResponse.AsyncSuccess();
+        }
+
+        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("色温")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
+        public ApiResponse SetColorTemperature([SwaggerParameter("设备编号")]string number, [SwaggerParameter("色温")][Range(2700, 6500)]int colorTemperature)
+        {
+            if (number is null)
+            {
+                throw new ArgumentNullException(nameof(number));
+            }
+
+            try
+            {
+                var values = number.Split('-');
+                this._deviceService.XA8(values[0], values[1], (ushort)colorTemperature);
+            }
+            catch (Exception ex)
+            {
+                ex.PrintStack();
+                return ApiResponse.Error(ex.Message);
+            }
+            return ApiResponse.AsyncSuccess();
+        }
+    }
+}
\ No newline at end of file
diff --git a/projects/IoTNode/DeviceServices/FBee/DeviceId.cs b/projects/IoTNode/DeviceServices/FBee/DeviceId.cs
index 181ec8b9..252ec367 100644
--- a/projects/IoTNode/DeviceServices/FBee/DeviceId.cs
+++ b/projects/IoTNode/DeviceServices/FBee/DeviceId.cs
@@ -14,7 +14,8 @@ namespace IoTNode.DeviceServices.FBee
             List.Add(new DeviceId { RawDeviceId = 0x0106, Name = "光强检测器", CategoryName = "监测", CategoryNumber = "40", Icon = "light" });
             List.Add(new DeviceId { RawDeviceId = 0x0163, Name = "红外转发器", CategoryName = "电器", CategoryNumber = "20", Icon = "control" });
             List.Add(new DeviceId { RawDeviceId = 0x0202, Name = "窗帘", CategoryName = "电器", CategoryNumber = "20", Icon = "curtain" });
-            List.Add(new DeviceId { RawDeviceId = 0x0220, Name = "调色灯", CategoryName = "照明", CategoryNumber = "30", Icon = "curtain" });
+            List.Add(new DeviceId { RawDeviceId = 0x0210, Name = "调色灯", CategoryName = "照明", CategoryNumber = "30", Icon = "lamp" });
+            List.Add(new DeviceId { RawDeviceId = 0x0220, Name = "色暖灯", CategoryName = "照明", CategoryNumber = "30", Icon = "lamp" });
             List.Add(new DeviceId { RawDeviceId = 0x0309, Name = "粉尘检测器", CategoryName = "监测", CategoryNumber = "40", Icon = "pm25" });
             List.Add(new DeviceId { RawDeviceId = 0x0302, Name = "温湿度传感器", CategoryName = "监测", CategoryNumber = "40", Icon = "humiture" });
             List.Add(new DeviceId { RawDeviceId = 0x0402, Name = "报警器", CategoryName = "安防", CategoryNumber = "10", Icon = "alarm" });
diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
index e58460d6..dc4c238f 100644
--- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
@@ -555,6 +555,10 @@ namespace IoTNode.DeviceServices.FBee
             {
                 return "/ColorLight/";
             }
+            else if (deviceName == "色暖灯")
+            {
+                return "/WarmLight/";
+            }
             else if (deviceName == "红外转发器")
             {
                 return "/Ir/";
@@ -730,7 +734,7 @@ namespace IoTNode.DeviceServices.FBee
         }
 
         /// <summary>
-        /// 0x83设置指定设备的颜色，即色调和饱和度
+        /// 0x84设置指定设备的颜色，即色调和饱和度
         /// </summary>
         public void X84(string sn, string ieee, [Range(0, 255)]byte hue, [Range(0, 255)]byte saturation)
         {
diff --git a/projects/IoTNode/Program.cs b/projects/IoTNode/Program.cs
index c968d18f..8e9ff137 100644
--- a/projects/IoTNode/Program.cs
+++ b/projects/IoTNode/Program.cs
@@ -43,6 +43,8 @@ namespace IoTNode
                    new EFConfigurationValue { Id = "stream.flv", Value=$"{stream}/live"},
                    new EFConfigurationValue { Id = "stream.hls", Value=$"{stream}/live"},
                    new EFConfigurationValue { Id = "ffmpeg.args", Value=" -y -threads {0} -rtsp_transport tcp -use_wallclock_as_timestamps 1 -stimeout 3000000 -i \"{1}\" -fflags +genpts -c copy -f flv \"{2}\""},
+                   new EFConfigurationValue { Id = "fbee.writelist", Value=""},
+                   new EFConfigurationValue { Id = "camera.writelist", Value=""},
                    //
                    new EFConfigurationValue { Id = "name", Value= "物联网节点"},
                    new EFConfigurationValue { Id = "logo", Value= "/images/logo.png",Type= InputType.ImageUrl},