update

Former-commit-id: dfaa4b4bcf4ece576967ecfe30fc3821281da3fe

projects/Demo/Demo.WinForms/Demo.WinForms.csproj

@@ -43,11 +43,11 @@
     <Reference Include="Geckofx-Winforms, Version=60.0.26.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
       <HintPath>..\packages\Geckofx60.32.60.0.26\lib\net45\Geckofx-Winforms.dll</HintPath>
     </Reference>
-    <Reference Include="LibVLCSharp, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="LibVLCSharp, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibVLCSharp.3.0.1\lib\net471\LibVLCSharp.dll</HintPath>
+      <HintPath>..\packages\LibVLCSharp.3.0.2\lib\net471\LibVLCSharp.dll</HintPath>
     </Reference>
-    <Reference Include="LibVLCSharp.WinForms, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="LibVLCSharp.WinForms, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibVLCSharp.WinForms.3.0.1\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
+      <HintPath>..\packages\LibVLCSharp.WinForms.3.0.2\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -56,8 +56,8 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Unosquare.Labs.EmbedIO, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Unosquare.Labs.EmbedIO, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EmbedIO.2.9.0\lib\netstandard2.0\Unosquare.Labs.EmbedIO.dll</HintPath>
+      <HintPath>..\packages\EmbedIO.2.9.1\lib\netstandard2.0\Unosquare.Labs.EmbedIO.dll</HintPath>
     </Reference>
     <Reference Include="Unosquare.Swan.Lite, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Unosquare.Swan.Lite.1.3.0\lib\net461\Unosquare.Swan.Lite.dll</HintPath>

projects/Demo/Demo.WinForms/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EmbedIO" version="2.9.0" targetFramework="net472" />
+  <package id="EmbedIO" version="2.9.1" targetFramework="net472" />
   <package id="Geckofx60.32" version="60.0.26" targetFramework="net472" />
-  <package id="LibVLCSharp" version="3.0.1" targetFramework="net472" />
+  <package id="LibVLCSharp" version="3.0.2" targetFramework="net472" />
-  <package id="LibVLCSharp.WinForms" version="3.0.1" targetFramework="net472" />
+  <package id="LibVLCSharp.WinForms" version="3.0.2" targetFramework="net472" />
   <package id="Unosquare.Swan.Lite" version="1.3.0" targetFramework="net472" />
 </packages>

projects/Demo/Demo/Demo.csproj

@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EmbedIO" Version="2.9.0" />
+    <PackageReference Include="EmbedIO" Version="2.9.1" />
     <PackageReference Include="Flurl" Version="2.8.2" />
-    <PackageReference Include="LibVLCSharp.Forms" Version="3.0.1" />
+    <PackageReference Include="LibVLCSharp.Forms" Version="3.0.2" />
     <PackageReference Include="NetCoreSerial" Version="1.3.1" />
     <PackageReference Include="Xam.Plugins.Notifier" Version="3.0.1" />
     <PackageReference Include="Xamarin.Forms" Version="4.0.0.482894" />

projects/Demo/Demo/MainPage.xaml

@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Demo.MainPage">
-    <StackLayout  Orientation="Vertical">
+    <StackLayout  Orientation="Vertical" BackgroundColor="LightBlue">
         <WebView x:Name="webView" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" />
     </StackLayout>
 </ContentPage>

projects/Demo/Demo/MainPage.xaml.cs

@@ -83,15 +83,20 @@ namespace Demo
         private void WebView_Navigating(object sender, WebNavigatingEventArgs e)
         {
             Console.WriteLine(e.Url);
-            if (e.Url.Contains("webqr.html"))
+            if (e.Url.Contains("notify.html"))
+            {
+                e.Cancel = true;
+                CrossLocalNotifications.Current.Show("title", e.Url);
+            }
+            else if (e.Url.Contains("webqr.html"))
             {
                 e.Cancel = true;
                 Scan();
             }
-            else if (e.Url.Contains("notify.html"))
+            else if (e.Url.Contains("face.html"))
             {
                 e.Cancel = true;
-                CrossLocalNotifications.Current.Show("title", e.Url);
+                Face();
             }
             else if (e.Url.Contains("rtmp://") || e.Url.Contains(".flv") || e.Url.Contains(".m3u8"))
             {
@@ -123,6 +128,10 @@ namespace Demo
             this.Navigation.PushAsync(scanPage);
         }
 
+        private void Face()
+        {
+        }
+
         public void Alert(object message, string title = "Ìáʾ", string button = "È·¶¨")
         {
             Device.BeginInvokeOnMainThread(() =>

projects/IoT/IoT.Resources/wwwroot/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <!--<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: content:">-->
+    <meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: content:">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
@@ -15,6 +15,7 @@
     <link rel="stylesheet" href="css/app.css">
 </head>
 <body>
+    zz
     <div id="app">
         <f7-app :params="f7params">
             <f7-statusbar></f7-statusbar>
@@ -24,7 +25,11 @@
     </div>
     <template id="page-login">
         <f7-page>
-            <f7-navbar title="登录"></f7-navbar>
+            <f7-navbar title="登录">
+                <f7-nav-right>
+                    <f7-link external panel-open="right" icon-f7="add" href="face.html"></f7-link>
+                </f7-nav-right>
+            </f7-navbar>
             <form v-bind:action="Server+'/Account/AppLogin'" v-on:submit.prevent="OnSubmit" class="login">
                 <div class="list no-hairlines-md">
                     <ul>
@@ -103,7 +108,7 @@
             <f7-toolbar tabbar labels bottom>
                 <f7-link tab-link="#tab-message" icon-ios="f7:chat" icon-md="f7:chat" text="消息"></f7-link>
                 <f7-link tab-link="#tab-nodes" icon-ios="f7:data" icon-md="f7:data" text="智慧教室" tab-link-active></f7-link>
-                <f7-link tab-link="#tab-user" icon-ios="f7:person" icon-md="f7:person" text="我的"></f7-link>
+                <f7-link tab-link="#tab-user" icon-ios="f7:person" icon-md="f7:person" text="我的1"></f7-link>
             </f7-toolbar>
             <f7-tabs>
                 <f7-tab id="tab-message" class="page-content">