From 7036fbc94a6693a22f6dd0e3b14f1d6c5ef4e5b5 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 21 Nov 2019 14:50:21 +0800
Subject: [PATCH] update

Former-commit-id: bf369630520ffb94cf3249e11daabd6085244df5
---
 projects/IoTCenter/Views/Home/Device.cshtml         | 9 ++++++---
 projects/IoTNode/DeviceServices/FBee/FBeeService.cs | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Device.cshtml b/projects/IoTCenter/Views/Home/Device.cshtml
index 052a8af4..4740653b 100644
--- a/projects/IoTCenter/Views/Home/Device.cshtml
+++ b/projects/IoTCenter/Views/Home/Device.cshtml
@@ -159,8 +159,8 @@
                 </div>
             </div>
         </div>
+        <!--属性-->
         <div class="row">
-            <!--属性-->
             <div class="col-md-12">
                 <div class="card">
                     <div class="card-header">
@@ -175,8 +175,8 @@
                 </div>
             </div>
         </div>
+        <!--命令-->
         <div class="row" v-if="model.Commands.length">
-            <!--命令-->
             <div class="col-md-12">
                 <div class="card">
                     <div class="card-header">
@@ -189,6 +189,7 @@
                 </div>
             </div>
         </div>
+        <!--摄像头-->
         <template v-if="model.Name==='摄像头'">
             <div class="row">
                 <div class="col-md-12">
@@ -242,6 +243,7 @@
                 </div>
             </div>
         </template>
+        <!--调色灯-->
         <template v-else-if="model.Name==='调色灯'">
             <div class="row">
                 <div class="col-md-12">
@@ -293,7 +295,8 @@
                 </div>
             </div>
         </template>
-        <template v-if="model.Name==='红外转发器'">
+        <!--红外转发器-->
+        <template v-else-if="model.Name==='红外转发器'">
             <div class="row">
                 <div class="col-md-12">
                     <div class="card">
diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
index b73f2b38..299aeb20 100644
--- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
@@ -537,7 +537,7 @@ namespace IoTNode.DeviceServices.FBee
                             //deviceRepo.SaveChanges();
                             //var deviceDto = device.To<EditDeviceModel>();
                             //this.SendToServer(Methods.EditDevice, deviceDto);
-                            //this.UpdateStatus(device);
+                            this.UpdateStatus(device);
                         }
                         else
                         {
@@ -601,7 +601,7 @@ namespace IoTNode.DeviceServices.FBee
                 var ieee = device.Number;
                 if (new int[] { 0x0002, 0x0009, 0x0081, 0x0202, 0x0220, 0x0051 }.Contains(deviceId))
                 {
-                    this.X85(sn, ieee);
+                    //this.X85(sn, ieee);
                 }
                 if (deviceId == 0x0220)
                 {
@@ -616,7 +616,7 @@ namespace IoTNode.DeviceServices.FBee
                 }
                 else if (deviceId == 0x0051)
                 {
-                    this.X8D07020000(sn, ieee);
+                    //this.X8D07020000(sn, ieee);
                 }
             }
             catch (Exception ex)