From 65c8fd83a3107293b4ab9bbe8d57d6ad21e5e331 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 27 May 2020 08:12:12 +0800
Subject: [PATCH] 1.0.0.527

Former-commit-id: f172144192a2631a02257c6ca45f0de75be27c64
---
 projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs | 4 +++-
 projects/IoTCenter/libman.json                              | 5 +++++
 projects/IoTCenter/wwwroot/js/iot.js                        | 2 +-
 projects/Version.cs                                         | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs
index a7c3fac5..bb8db104 100644
--- a/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs
+++ b/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs
@@ -5,8 +5,10 @@ using Infrastructure.Data;
 using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace IoT.Shared.Areas.Admin.Controlls
 {
@@ -31,7 +33,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
                 {
                     try
                     {
-                        this.Repo.Delete(this.Repo.FindBy(id));
+                        this.Repo.Delete(this.Repo.Table().Include(o => o.Scenes).FirstOrDefault(o => o.Id == id));
                         this.Repo.SaveChanges();
                     }
                     catch (Exception ex)
diff --git a/projects/IoTCenter/libman.json b/projects/IoTCenter/libman.json
index cacce564..a08bf35a 100644
--- a/projects/IoTCenter/libman.json
+++ b/projects/IoTCenter/libman.json
@@ -183,6 +183,11 @@
       "destination": "wwwroot/lib/jqcron",
       "files": [ "jqCron.css", "jqCron.js", "jqCron.cn.js" ]
     },
+    {
+      "library": "../lib/local/jswebrtc/dist/",
+      "destination": "wwwroot/lib/jswebrtc/",
+      "files": [ "jswebrtc.min.js" ]
+    },
     {
       "library": "../lib/local/fonts/",
       "destination": "wwwroot/fonts/"
diff --git a/projects/IoTCenter/wwwroot/js/iot.js b/projects/IoTCenter/wwwroot/js/iot.js
index 6944fb86..d5942d2e 100644
--- a/projects/IoTCenter/wwwroot/js/iot.js
+++ b/projects/IoTCenter/wwwroot/js/iot.js
@@ -1,5 +1,5 @@
 var time = '1d';
-if (WXInlinePlayer.isSupport()) {
+if(window.WXInlinePlayer&&WXInlinePlayer.isSupport()) {
     WXInlinePlayer.init({
         asmUrl: baseUrl+'/lib/WXInlinePlayer/prod.all.asm.combine.js',
         wasmUrl: baseUrl +'/lib/WXInlinePlayer/prod.all.wasm.combine.js'
diff --git a/projects/Version.cs b/projects/Version.cs
index a1b49dca..1880b8d4 100644
--- a/projects/Version.cs
+++ b/projects/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.526")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.0.527")]
\ No newline at end of file