From 38a1d0bd0dc49e018c138b3e633860bf01c1e12e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 19 Apr 2019 15:43:03 +0800
Subject: [PATCH] =?UTF-8?q?DEMO=E6=92=AD=E6=94=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8Candroid=E5=92=8Cios=E5=AE=8C=E6=88=90=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projects/Demo/Demo/MainPage.xaml.cs   |   2 +-
 projects/Demo/Demo/OnvifPage.xaml     |  10 +++-------
 projects/Demo/Demo/OnvifPage.xaml.cs  |   3 ++-
 projects/Demo/Demo/wwwroot/index.html |   6 ++++--
 projects/Demo/Demo/wwwroot/js/app.js  | Bin 30080 -> 30094 bytes
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/projects/Demo/Demo/MainPage.xaml.cs b/projects/Demo/Demo/MainPage.xaml.cs
index 877b3917..e7ef487a 100644
--- a/projects/Demo/Demo/MainPage.xaml.cs
+++ b/projects/Demo/Demo/MainPage.xaml.cs
@@ -29,7 +29,7 @@ namespace Demo
                 e.Cancel = true;
                 CrossLocalNotifications.Current.Show("title", e.Url);
             }
-            else if (e.Url.Contains("rtmp://"))
+            else if (e.Url.Contains("rtmp://") || e.Url.Contains(".flv") || e.Url.Contains(".m3u8"))
             {
                 e.Cancel = true;
                 this.Navigation.PushAsync(new OnvifPage(e.Url));
diff --git a/projects/Demo/Demo/OnvifPage.xaml b/projects/Demo/Demo/OnvifPage.xaml
index 29395744..1a7aea31 100644
--- a/projects/Demo/Demo/OnvifPage.xaml
+++ b/projects/Demo/Demo/OnvifPage.xaml
@@ -3,11 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:shared="clr-namespace:LibVLCSharp.Forms.Shared;assembly=LibVLCSharp.Forms"
              x:Class="Demo.OnvifPage">
-    <ContentPage.Content>
-        <StackLayout>
-            <Grid>
-                <shared:VideoView x:Name="videoView" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" />
-            </Grid>
-        </StackLayout>
-    </ContentPage.Content>
+    <Grid>
+        <shared:VideoView x:Name="videoView" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" />
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/projects/Demo/Demo/OnvifPage.xaml.cs b/projects/Demo/Demo/OnvifPage.xaml.cs
index 3c1fa508..9a3efd37 100644
--- a/projects/Demo/Demo/OnvifPage.xaml.cs
+++ b/projects/Demo/Demo/OnvifPage.xaml.cs
@@ -15,6 +15,7 @@ namespace Demo
         {
             this._url = url;
             InitializeComponent();
+            NavigationPage.SetHasNavigationBar(this, false);
             Core.Initialize();
             this._libvlc = new LibVLC();
         }
@@ -22,7 +23,7 @@ namespace Demo
         protected override void OnAppearing()
         {
             var media = new Media(_libvlc, this._url, FromType.FromLocation);
-            media.AddOption(new MediaConfiguration().EnableHardwareDecoding());
+            //media.AddOption(new MediaConfiguration().EnableHardwareDecoding());
             media.AddOption(":network-caching=0");
             media.AddOption(":clock-jitter=0");
             media.AddOption(":clock-synchro=0");
diff --git a/projects/Demo/Demo/wwwroot/index.html b/projects/Demo/Demo/wwwroot/index.html
index 876444a2..2911fb1c 100644
--- a/projects/Demo/Demo/wwwroot/index.html
+++ b/projects/Demo/Demo/wwwroot/index.html
@@ -539,11 +539,13 @@
             </div>
             <div class="block-title" v-if="Device.Apis.length">操作</div>
             <div class="list" v-if="Device.Apis.length">
-                <ul>
+                <ul v-if="Device.Name==='摄像头'">
                     <li>
                         <div class="item-content">
                             <div class="item-inner">
-                                <a style='width:100%;' v-if="Device.Name==='摄像头'" class="button button-large button-fill button-outline external" :href="getUrl()">查看视频</a>
+                                <a style='width:100%;' class="button button-large button-fill button-outline external" :href="getUrl('rtmp')">RTMP预览</a>
+                                <a style='width:100%;' class="button button-large button-fill button-outline external" :href="getUrl('flv')">FLV预览</a>
+                                <a style='width:100%;' class="button button-large button-fill button-outline external" :href="getUrl('hls')">HLS预览</a>
                             </div>
                         </div>
                     </li>
diff --git a/projects/Demo/Demo/wwwroot/js/app.js b/projects/Demo/Demo/wwwroot/js/app.js
index 2b7a0b1366ac2208a55fc01ee951a6c9feef7677..73ebff792597352ba16886781934527655843b44 100644
GIT binary patch
delta 48
zcmZp8&Di&val^X=))IzFhJwixjZ`NKBu*06U;y(OQW>-v)ESI`Sab9G#EZfJoO=$?

delta 40
wcmeBs&Dijoal^ZW$the)lj|ZICeKI|;#FrTVklwAWhh`UVo=|_H}Rq{08NArl>h($