diff --git a/projects/Demo/Demo.Android/Resources/drawable/splash.png b/projects/Demo/Demo.Android/Resources/drawable/splash.png index da80bb17..b4f0ca9c 100644 Binary files a/projects/Demo/Demo.Android/Resources/drawable/splash.png and b/projects/Demo/Demo.Android/Resources/drawable/splash.png differ diff --git a/projects/Demo/Demo.iOS/Info.plist b/projects/Demo/Demo.iOS/Info.plist index 774deff3..953153f0 100644 --- a/projects/Demo/Demo.iOS/Info.plist +++ b/projects/Demo/Demo.iOS/Info.plist @@ -1,53 +1,51 @@ - - UIDeviceFamily - - 1 - 2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CFBundleDisplayName - Demo - CFBundleIdentifier - com.nbaxp.Demo - CFBundleVersion - 1.0 - CFBundleName - Demo - NSCameraUsageDescription - request camera permission - UIRequiredDeviceCapabilities - - video-camera - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - UIMainStoryboardFile - LaunchScreen - UILaunchStoryboardName - LaunchScreen - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - XSLaunchImageAssets - Assets.xcassets/LaunchImages.launchimage - MinimumOSVersion - 12.1 - - \ No newline at end of file + + UIDeviceFamily + + 1 + 2 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CFBundleDisplayName + Demo + CFBundleIdentifier + com.nbaxp.Demo + CFBundleVersion + 1.0 + CFBundleName + Demo + NSCameraUsageDescription + request camera permission + UIRequiredDeviceCapabilities + + video-camera + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + UIMainStoryboardFile + LaunchScreen + UILaunchStoryboardName + LaunchScreen + XSAppIconAssets + Assets.xcassets/AppIcon.appiconset + XSLaunchImageAssets + Assets.xcassets/LaunchImages.launchimage + + diff --git a/projects/Demo/Demo.iOS/Resources/LaunchScreen.storyboard b/projects/Demo/Demo.iOS/Resources/LaunchScreen.storyboard index 3f7658f2..1c63f2e4 100644 --- a/projects/Demo/Demo.iOS/Resources/LaunchScreen.storyboard +++ b/projects/Demo/Demo.iOS/Resources/LaunchScreen.storyboard @@ -1,6 +1,6 @@ - + @@ -17,15 +17,16 @@ - + - + - - + + + @@ -33,7 +34,8 @@ + - + \ No newline at end of file diff --git a/projects/Demo/Demo.iOS/Resources/splash.png b/projects/Demo/Demo.iOS/Resources/splash.png index da80bb17..b4f0ca9c 100644 Binary files a/projects/Demo/Demo.iOS/Resources/splash.png and b/projects/Demo/Demo.iOS/Resources/splash.png differ diff --git a/projects/Demo/Demo/Demo.csproj b/projects/Demo/Demo/Demo.csproj index fba1b292..4e447046 100644 --- a/projects/Demo/Demo/Demo.csproj +++ b/projects/Demo/Demo/Demo.csproj @@ -10,7 +10,7 @@ - + diff --git a/projects/Demo/Demo/MainPage.xaml b/projects/Demo/Demo/MainPage.xaml index b38c95b5..6f257a6b 100644 --- a/projects/Demo/Demo/MainPage.xaml +++ b/projects/Demo/Demo/MainPage.xaml @@ -1,10 +1,8 @@ - \ No newline at end of file diff --git a/projects/Demo/Demo/OnvifPage.xaml b/projects/Demo/Demo/OnvifPage.xaml index 963f23dc..88c2dde2 100644 --- a/projects/Demo/Demo/OnvifPage.xaml +++ b/projects/Demo/Demo/OnvifPage.xaml @@ -6,30 +6,30 @@ - - + - - - - + + + - - - + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/projects/Demo/Demo/OnvifPage.xaml.cs b/projects/Demo/Demo/OnvifPage.xaml.cs index ce328034..d3af7bc4 100644 --- a/projects/Demo/Demo/OnvifPage.xaml.cs +++ b/projects/Demo/Demo/OnvifPage.xaml.cs @@ -2,7 +2,6 @@ using LibVLCSharp.Shared; using System; using System.Net.Http; -using System.Threading.Tasks; using Xamarin.Forms; using Xamarin.Forms.Xaml; @@ -40,9 +39,8 @@ namespace Demo this.zoomout.IsEnabled = false; } this.back.Source = SetImage("back.png"); - this.shot.Source = SetImage("shot.png"); - this.mute.Source = SetImage("volume.png"); - this.volume.Value = 50; + this.mute.Source = SetImage("mute.png"); + this.volume.Value = 0; } protected override void OnAppearing() @@ -57,7 +55,7 @@ namespace Demo media.AddOption(":clock-synchro=0"); } var player = new MediaPlayer(_libvlc); - //this.mute.Source = this.SetImage("mute2.png"); + player.Volume = 0; videoView.MediaPlayer = player; player.Play(media); } @@ -79,18 +77,6 @@ namespace Demo this.Navigation.PopAsync(); } - private void Shot_Clicked(object sender, EventArgs e) - { - var path = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures); - Console.WriteLine(path); - if (this.videoView.MediaPlayer.TakeSnapshot(2, path, 0, 0)) - { - } - else - { - } - } - private void Volume_ValueChanged(object sender, ValueChangedEventArgs e) { if (this.videoView?.MediaPlayer != null) diff --git a/projects/Demo/Demo/wwwroot/images/down.png b/projects/Demo/Demo/wwwroot/images/down.png index 30c959c7..857ca765 100644 Binary files a/projects/Demo/Demo/wwwroot/images/down.png and b/projects/Demo/Demo/wwwroot/images/down.png differ diff --git a/projects/Demo/Demo/wwwroot/images/left.png b/projects/Demo/Demo/wwwroot/images/left.png index ba0184ea..5956e674 100644 Binary files a/projects/Demo/Demo/wwwroot/images/left.png and b/projects/Demo/Demo/wwwroot/images/left.png differ diff --git a/projects/Demo/Demo/wwwroot/images/right.png b/projects/Demo/Demo/wwwroot/images/right.png index d95576a6..1e4c76fa 100644 Binary files a/projects/Demo/Demo/wwwroot/images/right.png and b/projects/Demo/Demo/wwwroot/images/right.png differ diff --git a/projects/Demo/Demo/wwwroot/images/up.png b/projects/Demo/Demo/wwwroot/images/up.png index 336b4ec4..69b56f72 100644 Binary files a/projects/Demo/Demo/wwwroot/images/up.png and b/projects/Demo/Demo/wwwroot/images/up.png differ diff --git a/projects/Demo/Demo/wwwroot/images/zoomin.png b/projects/Demo/Demo/wwwroot/images/zoomin.png index 82a2aea5..2dd1c410 100644 Binary files a/projects/Demo/Demo/wwwroot/images/zoomin.png and b/projects/Demo/Demo/wwwroot/images/zoomin.png differ diff --git a/projects/Demo/Demo/wwwroot/images/zoomout.png b/projects/Demo/Demo/wwwroot/images/zoomout.png index 4c87129c..093194b0 100644 Binary files a/projects/Demo/Demo/wwwroot/images/zoomout.png and b/projects/Demo/Demo/wwwroot/images/zoomout.png differ