diff --git a/projects/Demo/Demo.WinForms/Demo.WinForms.csproj b/projects/Demo/Demo.WinForms/Demo.WinForms.csproj index 35801a13..69b41fe8 100644 --- a/projects/Demo/Demo.WinForms/Demo.WinForms.csproj +++ b/projects/Demo/Demo.WinForms/Demo.WinForms.csproj @@ -43,11 +43,11 @@ ..\packages\Geckofx60.32.60.0.26\lib\net45\Geckofx-Winforms.dll - - ..\packages\LibVLCSharp.3.0.1\lib\net471\LibVLCSharp.dll + + ..\packages\LibVLCSharp.3.0.2\lib\net471\LibVLCSharp.dll - - ..\packages\LibVLCSharp.WinForms.3.0.1\lib\net40\LibVLCSharp.WinForms.dll + + ..\packages\LibVLCSharp.WinForms.3.0.2\lib\net40\LibVLCSharp.WinForms.dll @@ -56,8 +56,8 @@ - - ..\packages\EmbedIO.2.9.0\lib\netstandard2.0\Unosquare.Labs.EmbedIO.dll + + ..\packages\EmbedIO.2.9.1\lib\netstandard2.0\Unosquare.Labs.EmbedIO.dll ..\packages\Unosquare.Swan.Lite.1.3.0\lib\net461\Unosquare.Swan.Lite.dll diff --git a/projects/Demo/Demo.WinForms/packages.config b/projects/Demo/Demo.WinForms/packages.config index c8141b30..56f9a3fb 100644 --- a/projects/Demo/Demo.WinForms/packages.config +++ b/projects/Demo/Demo.WinForms/packages.config @@ -1,8 +1,8 @@  - + - - + + \ No newline at end of file diff --git a/projects/Demo/Demo/Demo.csproj b/projects/Demo/Demo/Demo.csproj index 95c98a1e..5ce860fe 100644 --- a/projects/Demo/Demo/Demo.csproj +++ b/projects/Demo/Demo/Demo.csproj @@ -10,9 +10,9 @@ - + - + diff --git a/projects/Demo/Demo/MainPage.xaml b/projects/Demo/Demo/MainPage.xaml index 82189813..c1646873 100644 --- a/projects/Demo/Demo/MainPage.xaml +++ b/projects/Demo/Demo/MainPage.xaml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/projects/Demo/Demo/MainPage.xaml.cs b/projects/Demo/Demo/MainPage.xaml.cs index 77920008..ed149505 100644 --- a/projects/Demo/Demo/MainPage.xaml.cs +++ b/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(() => diff --git a/projects/IoT/IoT.Resources/wwwroot/index.html b/projects/IoT/IoT.Resources/wwwroot/index.html index ccc559eb..68782f16 100644 --- a/projects/IoT/IoT.Resources/wwwroot/index.html +++ b/projects/IoT/IoT.Resources/wwwroot/index.html @@ -2,7 +2,7 @@ - + @@ -15,6 +15,7 @@ + zz
@@ -24,7 +25,11 @@