1.0 rc.12

Former-commit-id: 8f85f63d5c67f19eae99e6fdb162d9b85d6f3b76

projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs

@@ -76,7 +76,6 @@ namespace IoT.Shared.DeviceServices.FBee
                         catch (Exception ex)
                         {
                             ex.PrintStack();
-                            this.Connect(item.Value);
                         }
                     }
                     await Task.Delay(1000 * 60);
@@ -186,6 +185,8 @@ namespace IoT.Shared.DeviceServices.FBee
                 }
                 var gateways = deviceRepo.ReadOnlyTable().Where(o => o.Product.Name == "FBee网关").ToList();
                 foreach (var gateway in gateways)
+                {
+                    try
                     {
                         if (Clients.Any(o => o.Key == gateway.Number))
                         {
@@ -210,6 +211,11 @@ namespace IoT.Shared.DeviceServices.FBee
                         }
                         this.X81(gateway.Number);
                     }
+                    catch (Exception ex)
+                    {
+                        ex.PrintStack();
+                    }
+                }
             }
         }
 
@@ -386,7 +392,6 @@ namespace IoT.Shared.DeviceServices.FBee
                 if (!client.Client.Connected)
                 {
                     this.Connect(client);
-                    client.Client.GetStream().Write(bytes);
                 }
             }
         }

projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs

@@ -171,6 +171,8 @@ namespace IoT.Shared.DeviceServices.Onvif
                             }
                             ipCamera.ParseProfiles();
 
+                            try
+                            {
                                 if (needAuth)
                                 {
                                     ipCamera.MainStreamUriXml = this._onvifDeviceManagement.GetStreamUri(ipCamera.DeviceUrl, ipCamera.MediaUrl, device.UserName, device.Password, ipCamera.Profiles.First().Token);
@@ -198,25 +200,6 @@ namespace IoT.Shared.DeviceServices.Onvif
                                 device.AddorUpdateData(device.CreateData("MainSnapshotUri", ipCamera.MainSnapshotUri, DeviceDataType.String, "主码流截图地址"));
                                 device.AddorUpdateData(device.CreateData("SubStreamUri", ipCamera.SubStreamUri, DeviceDataType.String, "子码流地址"));
                                 device.AddorUpdateData(device.CreateData("SubSnapshotUri", ipCamera.SubSnapshotUri, DeviceDataType.String, "子码流截图地址"));
-                            try
-                            {
-                                var jpgBytes = ScreenShot(device);
-                                using (var stream = new MemoryStream(jpgBytes))
-                                {
-                                    using (var bigImage = Image.FromStream(stream))
-                                    {
-                                        var width = 640;
-                                        var height = 480;
-                                        using (var bitmap = new Bitmap(width, height))
-                                        {
-                                            using (Graphics g = Graphics.FromImage((Image)bitmap))
-                                            {
-                                                g.DrawImage(bigImage, 0, 0, width, height);
-                                                device.AddorUpdateData(device.CreateData("Snapshot", Convert.ToBase64String(bitmap.ToJpeg(80)), DeviceDataType.String, "截图"));
-                                            }
-                                        }
-                                    }
-                                }
                             }
                             catch (Exception ex)
                             {

projects/IoT/IoTNode/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.11",
+  "version": "1.0.0-rc.12",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",

projects/IoTCenter/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.11",
+  "version": "1.0.0-rc.12",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",

projects/IoTCenter/wwwroot/node.html

@@ -473,9 +473,9 @@
                 <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 style="height:32px;" @click="CallApi(device.Number,'/Curtain/On')" src="/images/left.png" />
-                            <img @click="CallApi(device.Number,'/Curtain/Stop')" src="/images/stop32.png" />
+                            <img style="height:32px;" @click="CallApi(device.Number,'/Curtain/Stop')" src="/images/stop.png" />
-                            <img @click="CallApi(device.Number,'/Curtain/Off')" src="/images/off.png" />
+                            <img style="height:32px;" @click="CallApi(device.Number,'/Curtain/Off')" src="/images/right.png" />
                         </div>
                     </div>
                 </div>