From 0d3978671ad259183fe47aa784c3cd06de6d4edc Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 20 Sep 2019 16:39:33 +0800
Subject: [PATCH] update

Former-commit-id: 6bfc8cd73f75938d12047f404762ee4eec714e0f
---
 projects/IoTCenter/Views/Home/Index.cshtml     |  3 +++
 projects/IoTCenter/Views/Home/Node.cshtml      |  3 +++
 projects/IoTCenter/wwwroot/node.default.html   |  4 ++--
 .../IoTClient/Assembly-CSharp-Editor.csproj    | 18 +++++++++++++++---
 projects/IoTClient/Assembly-CSharp.csproj      |  4 ++--
 .../Assets/Scripts/WebViewController.cs        |  3 +++
 .../IoT.Resources.csproj.user.meta             |  7 +++++++
 .../wwwroot/images/off.png.meta                |  7 +++++++
 .../StreamingAssets/wwwroot/images/on.png.meta |  7 +++++++
 .../wwwroot/images/person.png.meta             |  7 +++++++
 .../wwwroot/images/warn.png.meta               |  7 +++++++
 projects/IoTClient/IoTClient.sln               |  2 +-
 12 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj.user.meta
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/off.png.meta
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/on.png.meta
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/person.png.meta
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/warn.png.meta

diff --git a/projects/IoTCenter/Views/Home/Index.cshtml b/projects/IoTCenter/Views/Home/Index.cshtml
index 3d9a5167..3b567f74 100644
--- a/projects/IoTCenter/Views/Home/Index.cshtml
+++ b/projects/IoTCenter/Views/Home/Index.cshtml
@@ -156,6 +156,9 @@
     <script src="lib/signalr/signalr.min.js"></script>
     <script>
         $(function () {
+            $.ajaxSetup({
+                cache: false
+            });
             var template = '@cfg["template"]';//get template name from server
             var url = template;
             $.get(url, function (html) {
diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 31d07315..61be5d41 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -229,6 +229,9 @@
     <script src="lib/signalr/signalr.min.js"></script>
     <script>
         $(function () {
+            $.ajaxSetup({
+                cache: false
+            });
             var template = new URI().query(true).tag;//get template name from server
             var url = template + '?number=' + new URI().query(true).number;
             $.get(template, function (html) {
diff --git a/projects/IoTCenter/wwwroot/node.default.html b/projects/IoTCenter/wwwroot/node.default.html
index 458f65b0..976f167e 100644
--- a/projects/IoTCenter/wwwroot/node.default.html
+++ b/projects/IoTCenter/wwwroot/node.default.html
@@ -527,7 +527,7 @@
         }
         return false;
     });
-    $('body').on('mousedown', 'img.camera.ajax', function (e) {
+    $('body').on('mousedown touchstart', 'img.camera.ajax', function (e) {
         var number = $('#camera').val();
         if ($(this).hasClass('Zoomin')) {
             ajax('/App/Exec', { connectionId: connectionId, number: number, method: '/Onvif/Zoomin' }, 'post');
@@ -546,7 +546,7 @@
         }
         return false;
     });
-    $('body').on('mouseup', 'img.ajax', function (e) {
+    $('body').on('mouseup touchend', 'img.ajax', function (e) {
         var number = $('#camera').val();
         ajax('/App/Exec', { number: number, method: '/Onvif/Stop' }, 'post');
         return false;
diff --git a/projects/IoTClient/Assembly-CSharp-Editor.csproj b/projects/IoTClient/Assembly-CSharp-Editor.csproj
index e39b6d78..f257b730 100644
--- a/projects/IoTClient/Assembly-CSharp-Editor.csproj
+++ b/projects/IoTClient/Assembly-CSharp-Editor.csproj
@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_14;UNITY_2018_3;UNITY_2018;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_EVENT_QUEUE;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VR;ENABLE_AR;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_RUNTIME_PERMISSIONS;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>0169</NoWarn>
+    <NoWarn>0169;CS0649;IDE0051</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,7 +34,7 @@
     <OutputPath>Temp\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>0169</NoWarn>
+    <NoWarn>0169;CS0649;IDE0051</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
@@ -316,11 +316,17 @@
     <Reference Include="UnityEditor.Graphs">
       <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEditor.Android.Extensions">
+      <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.iOS.Extensions">
+      <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEditor.WindowsStandalone.Extensions">
       <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
-      <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/15.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
+      <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
     </Reference>
     <Reference Include="NetCoreSerial">
       <HintPath>D:/1.0/ZHXY/projects/IoTClient/Assets/Plugins/NetCoreSerial.dll</HintPath>
@@ -343,6 +349,12 @@
     <Reference Include="UnityEditor.Purchasing">
       <HintPath>D:/1.0/ZHXY/projects/IoTClient/Library/PackageCache/com.unity.purchasing@2.0.3/Editor/UnityEditor.Purchasing.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEditor.iOS.Extensions.Xcode">
+      <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.iOS.Extensions.Common">
+      <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>
+    </Reference>
     <Reference Include="mscorlib">
       <HintPath>D:/ProgramFiles/Unity/2018.3.14f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
     </Reference>
diff --git a/projects/IoTClient/Assembly-CSharp.csproj b/projects/IoTClient/Assembly-CSharp.csproj
index 7dfb1a93..259f32d7 100644
--- a/projects/IoTClient/Assembly-CSharp.csproj
+++ b/projects/IoTClient/Assembly-CSharp.csproj
@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_14;UNITY_2018_3;UNITY_2018;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_EVENT_QUEUE;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VR;ENABLE_AR;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_RUNTIME_PERMISSIONS;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>0169</NoWarn>
+    <NoWarn>0169;CS0649;IDE0051</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,7 +34,7 @@
     <OutputPath>Temp\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>0169</NoWarn>
+    <NoWarn>0169;CS0649;IDE0051</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/projects/IoTClient/Assets/Scripts/WebViewController.cs b/projects/IoTClient/Assets/Scripts/WebViewController.cs
index 553e01ed..5c556445 100644
--- a/projects/IoTClient/Assets/Scripts/WebViewController.cs
+++ b/projects/IoTClient/Assets/Scripts/WebViewController.cs
@@ -15,8 +15,11 @@ public class WebViewController : MonoBehaviour
 
     private void Start()
     {
+        UniWebView.SetAllowAutoPlay(true);
+        UniWebView.SetAllowInlinePlay(true);
         var webViewGameObject = new GameObject("UniWebView");
         webView = webViewGameObject.AddComponent<UniWebView>();
+        webView.SetCalloutEnabled(false);
         webView.SetUserAgent(webView.GetUserAgent() + "app");
         webView.Frame = new Rect(0, 0, Screen.width, Screen.height);
         webView.OnOrientationChanged += (view, orientation) =>
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj.user.meta b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj.user.meta
new file mode 100644
index 00000000..581028da
--- /dev/null
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj.user.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: df1b694da9de6e14a9998e435299c092
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/off.png.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/off.png.meta
new file mode 100644
index 00000000..b99de5aa
--- /dev/null
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/off.png.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bc8c4b776b32556429c9369ea1032c16
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/on.png.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/on.png.meta
new file mode 100644
index 00000000..9720f593
--- /dev/null
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/on.png.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f69f432c742bd8f4b8af323b825b54a9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/person.png.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/person.png.meta
new file mode 100644
index 00000000..0460ccae
--- /dev/null
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/person.png.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f386951d30b81ab42a701744ea81a6ec
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/warn.png.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/warn.png.meta
new file mode 100644
index 00000000..2db16d83
--- /dev/null
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/warn.png.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd8e7796f2fb8a844be7b667b6d12783
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/projects/IoTClient/IoTClient.sln b/projects/IoTClient/IoTClient.sln
index 366902ce..61b2978e 100644
--- a/projects/IoTClient/IoTClient.sln
+++ b/projects/IoTClient/IoTClient.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio 16
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{EF6565BD-C12A-AF2F-9766-E75AAE388FD9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{74FE0653-2917-AAD7-D8C4-EFCC5DE2DC43}"