diff --git a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
index e6805e27..17da1621 100644
--- a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
@@ -1276,7 +1276,7 @@ namespace IoT.Shared.DeviceServices.FBee
                         else if (clusterId == ClusterId.temperature)
                         {
                             var temperature = BitConverter.ToInt16(props[0x0000]) / 100f;
-                            var desc = temperature < 16 ? "低" : (temperature > 26 ? "高" : "适中");
+                            var desc = temperature < 16 ? "低" : (temperature > 28 ? "高" : "适中");
                             var data1 = device.CreateData(Keys.Temperature, temperature, DeviceDataType.Float, "温度", "℃", desc);
                             device.AddorUpdateData(data1);
                             var dto1 = data1.To<EditDataModel>();
@@ -1286,7 +1286,7 @@ namespace IoT.Shared.DeviceServices.FBee
                         else if (clusterId == ClusterId.humidity)
                         {
                             var humidity = BitConverter.ToInt16(props[0x0000]) / 100f;
-                            var desc = humidity < 40 ? "低" : (humidity > 50 ? "高" : "适中");
+                            var desc = humidity < 30 ? "低" : (humidity > 80 ? "高" : "适中");
                             var data1 = device.CreateData(Keys.Humidity, humidity, DeviceDataType.Float, "湿度", "RH%", desc);
                             device.AddorUpdateData(data1);
                             var dto1 = data1.To<EditDataModel>();
diff --git a/projects/IoT/IoTNode/appsettings.json b/projects/IoT/IoTNode/appsettings.json
index 324313b4..857e388c 100644
--- a/projects/IoT/IoTNode/appsettings.json
+++ b/projects/IoT/IoTNode/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",
diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json
index 0c412c57..8919826a 100644
--- a/projects/IoTCenter/appsettings.json
+++ b/projects/IoTCenter/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",
diff --git a/projects/IoTCenter/wwwroot/node.html b/projects/IoTCenter/wwwroot/node.html
index 572edbd6..1fa94994 100644
--- a/projects/IoTCenter/wwwroot/node.html
+++ b/projects/IoTCenter/wwwroot/node.html
@@ -44,6 +44,14 @@
             right: 0;
         }
 
+    .danger {
+        color: red;
+    }
+
+    .normal {
+        color: green;
+    }
+
     .ptz {
         width: 100%;
     }
@@ -341,7 +349,9 @@
                             <img src="/images/temperature.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'温度','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'温度','Description')==='适中'?'normal':'danger'">
+                                {{GetDeviceDataValue(device.Number,'温度','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">温度：{{GetDeviceDataValue(device.Number,'温度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}</span>
@@ -356,7 +366,9 @@
                             <img src="/images/humidity.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'湿度','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'湿度','Description')==='适中'?'normal':'danger'">
+                                {{GetDeviceDataValue(device.Number,'湿度','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">湿度：{{GetDeviceDataValue(device.Number,'湿度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}</span>
@@ -371,7 +383,9 @@
                             <img src="/images/pm25.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'PM2.5','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'PM2.5','Description')==='污染'?'danger':'normal'">
+                                {{GetDeviceDataValue(device.Number,'PM2.5','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM2.5：{{GetDeviceDataValue(device.Number,'PM2.5','Value')}}{{ GetDeviceDataValue(device.Number,'PM2.5','Unit')}}</span>
@@ -379,21 +393,23 @@
                     </div>
                 </div>
             </div>
-            <!--<div class="col-md-6  col-xs-6">
+            <div class="col-md-6  col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
                         <div class="col-md-4 col-xs-4">
                             <img src="/images/pm25.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'PM100','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'PM10','Description')==='污染'?'danger':'normal'">
+                                {{GetDeviceDataValue(device.Number,'PM10','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM10：{{GetDeviceDataValue(device.Number,'PM100','Value')}}{{ GetDeviceDataValue(device.Number,'PM100','Unit')}}</span>
+                            <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM10：{{GetDeviceDataValue(device.Number,'PM10','Value')}}{{ GetDeviceDataValue(device.Number,'PM10','Unit')}}</span>
                         </div>
                     </div>
                 </div>
-            </div>-->
+            </div>
             <div class="col-md-6  col-xs-6" v-for="device in GetDevices('光强检测器')" :data-device-number="device.Number">
                 <div class="box box-solid">
                     <div class="row">
@@ -401,7 +417,9 @@
                             <img src="/images/light.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'光照度','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'光照度','Description')==='适中'?'normal':'danger'">
+                                {{GetDeviceDataValue(device.Number,'光照度','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">{{device.DisplayName||device.Name}} 光照 {{GetDeviceDataValue(device.Number,'光照度','Value')}}{{ GetDeviceDataValue(device.Number,'光照度','Unit')}}</span>
@@ -417,6 +435,7 @@
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <img src="/images/warn.png" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetDeviceDataValue(device.Number,'状态','Value')==='警报'" />
+                            <h3 style="line-height:100px;margin:0;" class="normal" v-else>正常</h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">{{device.DisplayName||device.Name}} {{GetDeviceDataValue(device.Number,'状态','Value') }}</span>
@@ -432,6 +451,7 @@
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <img src="/images/warn.png" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetDeviceDataValue(device.Number,'状态','Value')==='警报'" />
+                            <h3 style="line-height:100px;margin:0;" class="normal" v-else>正常</h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">{{device.DisplayName||device.Name}} {{GetDeviceDataValue(device.Number,'状态','Value') }}</span>
@@ -441,11 +461,31 @@
             </div>
         </div>
     </div>
-
+    <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('窗帘')" :data-device-number="device.Number">
+        <div class="box box-solid">
+            <div class="box-header with-border">
+                <h3 class="box-title"><img src="/images/curtain.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <div class="box-tools pull-right">
+                    {{GetDataValue(device.Number,'状态')}}
+                </div>
+            </div>
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="row" style="text-align:center;padding:3px 0;">
+                            <img @click="CallApi(device.Number,'/Curtain/On')" src="/images/on.png" />
+                            <img @click="CallApi(device.Number,'/Curtain/Stop')" src="/images/stop32.png" />
+                            <img @click="CallApi(device.Number,'/Curtain/Off')" src="/images/off.png" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('一路开关')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/switch.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
             </div>
             <div class="box-body">
                 <div class="row">
@@ -462,7 +502,7 @@
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('二路开关')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/switch.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                 <div class="box-tools pull-right">
                     <button class="btn btn-sm bg-olive" @click="CallApi(device.Number,'/Switch3/On')" :data-node-number="ViewModel.Number">一键开</button>
                     <button class="btn btn-sm bg-olive" @click="CallApi(device.Number,'/Switch3/Off')" :data-node-number="ViewModel.Number">一键关</button>
@@ -510,7 +550,7 @@
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('智能插座')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/socket.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                 <div class="box-tools pull-right">
                     {{parseFloat(GetDataValue(device.Number,'电量')).toFixed(2)}} kWh
                 </div>
@@ -530,7 +570,7 @@
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('插座')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/socket.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
             </div>
             <div class="box-body">
                 <div class="row">
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index f76dc3e4..18176fe7 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -11,5 +11,6 @@
     <EmbeddedResource Include="wwwroot\**\*" />
   </ItemGroup><ItemGroup>
   <None Remove="wwwroot\images\smoke.png" />
+  <None Remove="wwwroot\images\stop32.png" />
 </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png
index 4003d3a7..c6123332 100644
Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png differ
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/stop32.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/stop32.png
new file mode 100644
index 00000000..5ddc4376
Binary files /dev/null and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/stop32.png differ
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomin.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomin.png
index 2dd1c410..d249f6e5 100644
Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomin.png and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomin.png differ
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomout.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomout.png
index 093194b0..9d09c3ce 100644
Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomout.png and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomout.png differ