From f861b381463ff750a028053b921d7eb90cd0f265 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 20 Nov 2019 12:03:08 +0800
Subject: [PATCH] update

Former-commit-id: 9e6ccdcee38c3059765b2b80c2e3e19df11c42f9
---
 projects/Infrastructure/Extensions/ByteExtensions.cs | 5 +++--
 projects/IoTCenter/Views/Home/Device.cshtml          | 1 -
 projects/IoTNode/DeviceServices/FBee/FBeeService.cs  | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/projects/Infrastructure/Extensions/ByteExtensions.cs b/projects/Infrastructure/Extensions/ByteExtensions.cs
index 6587faab..3546a5a9 100644
--- a/projects/Infrastructure/Extensions/ByteExtensions.cs
+++ b/projects/Infrastructure/Extensions/ByteExtensions.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 namespace Infrastructure.Extensions
 {
@@ -56,7 +57,7 @@ namespace Infrastructure.Extensions
 
             var buffer = new byte[length];
             bytes.Read(buffer);
-            return new string(buffer.Select(o => (char)o).ToArray());
+            return Encoding.ASCII.GetString(buffer).Trim('\0');
         }
 
         public static string ReadHexString(this Stream bytes, int length)
@@ -68,7 +69,7 @@ namespace Infrastructure.Extensions
 
             var buffer = new byte[length];
             bytes.Read(buffer);
-            return BitConverter.ToString(buffer).Replace("-", "", StringComparison.CurrentCulture).ToLower(CultureInfo.CurrentCulture);
+            return BitConverter.ToString(buffer.Reverse().ToArray()).Replace("-", "");
         }
 
         public static string ReadHexStringDesc(this Stream bytes, int length)
diff --git a/projects/IoTCenter/Views/Home/Device.cshtml b/projects/IoTCenter/Views/Home/Device.cshtml
index 703f6276..770a9cbb 100644
--- a/projects/IoTCenter/Views/Home/Device.cshtml
+++ b/projects/IoTCenter/Views/Home/Device.cshtml
@@ -207,7 +207,6 @@
                                 <input type="hidden" name="Number" :value="model.Number" />
                                 <input type="hidden" name="Method" :value="api.Method" />
                                 <div class="form-group" v-for="parameter in api.Parameters" v-if="parameter.Name!=='number'">
-                                    <div>{{model.Name}}{{api.Name}}{{parameter.Name}}</div>
                                     <label :for="parameter.Name">{{parameter.Description}}:</label>
                                     <template v-if="model.Name==='网关'&&api.Name==='删掉制定设备'&&parameter.Name==='设备编号'">
                                     </template>
diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
index 9cacbd01..b73f2b38 100644
--- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
@@ -910,7 +910,7 @@ namespace IoTNode.DeviceServices.FBee
                 var responseType = ms.ReadByte();
                 var dataLength = ms.ReadByte();
                 var version = ms.ReadASIIString(5);
-                var snid = ms.ReadHexString(4);
+                var snid = ms.ReadHexString(3);
                 using (var scope = _applicationServices.CreateScope())
                 {
                     var deviceRepo = scope.ServiceProvider.GetService<IRepository<Device>>();
@@ -925,9 +925,10 @@ namespace IoTNode.DeviceServices.FBee
                     {
                         this.UpdateData(deviceRepo, device, device.CreateData(Keys.Version, version, DeviceDataType.String, "版本", timestamp: timestamp));
                         this.UpdateData(deviceRepo, device, device.CreateData(Keys.DeviceCount, ms.ReadByte(), DeviceDataType.Int, "设备数量", timestamp: timestamp));
-                        this.UpdateDevice(deviceRepo, device);
-                        device.UserName = ms.ReadASIIString(20);
-                        device.Password = ms.ReadASIIString(20);
+                        var userName = ms.ReadASIIString(20);
+                        var password = ms.ReadASIIString(20);
+                        device.UserName = userName;
+                        device.Password = password;
                         this.UpdateDevice(deviceRepo, device);
                         ms.ReadByte();
                         ms.ReadByte();