添加播放服务，对接播放页。

flash168 · May 20, 2024 · 77285fb · 77285fb
1 parent 7b6f288
commit 77285fb
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 12 deletions.
diff --git a/PeachPlayer/App.axaml.cs b/PeachPlayer/App.axaml.cs
@@ -4,6 +4,7 @@
 using Avalonia.Markup.Xaml;
 using Peach.Application.Interfaces;
 using Peach.Application.Services;
+using PeachPlayer.Services;
 using PeachPlayer.Views;
 using ReactiveUI;
 using Splat;
@@ -33,7 +34,9 @@ public override void OnFrameworkInitializationCompleted()
             {
                 // DataContext = new MainViewModel()
             };
-            Locator.CurrentMutable.RegisterConstant(new NotificationManager(desktop.MainWindow));
+            desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnMainWindowClose;
+
+            //  Locator.CurrentMutable.RegisterConstant(new NotificationManager(desktop.MainWindow));
         }
         //else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         //{
@@ -52,6 +55,8 @@ private void ConfigureServiceProvider()
         Locator.CurrentMutable.RegisterConstant(new SourceService(), typeof(ISourceService));
         Locator.CurrentMutable.RegisterConstant(new SpiderService(), typeof(ISpiderService));
 
+        Locator.CurrentMutable.RegisterConstant(new PlayerService(), typeof(IPlayerService));
+
         //Locator.CurrentMutable.RegisterLazySingleton(() => new RuleTestService(), typeof(IRuleTestService));
         //Locator.Current.GetService<IRuleTestService>();
 

diff --git a/PeachPlayer/Assets/Images/bg-player.jpg b/PeachPlayer/Assets/Images/bg-player.jpg
diff --git a/PeachPlayer/PeachPlayer.csproj b/PeachPlayer/PeachPlayer.csproj
@@ -12,6 +12,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<None Remove="Assets\Images\bg-player.jpg" />
 		<None Remove="Assets\Images\pay\weixinpay.jpg" />
 		<None Remove="Assets\Images\pay\zhifubaopay.jpg" />
 	</ItemGroup>

diff --git a/PeachPlayer/Services/IPlayerService.cs b/PeachPlayer/Services/IPlayerService.cs
@@ -0,0 +1,10 @@
+using Peach.Model.Models;
+
+namespace PeachPlayer.Services
+{
+    public interface IPlayerService
+    {
+        void Play(SmallVodModel vod);
+
+    }
+}
diff --git a/PeachPlayer/Services/PlayerService.cs b/PeachPlayer/Services/PlayerService.cs
@@ -0,0 +1,45 @@
+using PeachPlayer.ViewModels;
+using PeachPlayer.Views;
+using Peach.Model.Models;
+using Avalonia.Controls;
+
+namespace PeachPlayer.Services
+{
+    public class PlayerService : IPlayerService
+    {
+
+        //初始化嗅探器
+
+        private static VideoPlayView videoPlayView;
+        private static SmallVodModel vodModel;
+        private static VideoPlayViewModel videoPlayViewModel;
+        public PlayerService()
+        {
+            videoPlayView = new VideoPlayView();
+            videoPlayView.Closing += (s, e) =>
+            {
+                videoPlayViewModel.Stop();
+                ((Window)s).Hide();
+                e.Cancel = true;
+            };
+            videoPlayViewModel = new VideoPlayViewModel();
+            videoPlayView.DataContext = videoPlayViewModel;
+        }
+
+        //播放
+        public void Play(SmallVodModel vod)
+        {
+            videoPlayView.Show();
+            videoPlayView.Activate();
+            if (videoPlayView.WindowState == WindowState.Minimized)
+                videoPlayView.WindowState = WindowState.Normal;
+
+            if (vodModel != vod)
+                videoPlayViewModel.Play(vod);
+
+            vodModel = vod;
+        }
+
+
+    }
+}
diff --git a/PeachPlayer/ViewModels/VideoPlayViewModel.cs b/PeachPlayer/ViewModels/VideoPlayViewModel.cs
@@ -1,18 +1,47 @@
-
+using Peach.Application.Interfaces;
 using Peach.Model.Models;
+using ReactiveUI;
+using Splat;
+
 
 namespace PeachPlayer.ViewModels
 {
     public class VideoPlayViewModel : ViewModelBase
     {
-        public VideoPlayViewModel() { }
-        public VideoPlayViewModel(SmallVodModel small)
+        private VodModel vod=new VodModel();
+        public VodModel Vod
         {
+            get { return vod; }
+            set { vod = value; this.RaiseAndSetIfChanged(ref vod, value); }
+        }
+
+        public string VodName => Vod?.vod_name;
 
+        public string VodContent => Vod?.vod_content;
+
+        public string Type_Remarks => Vod?.vod_remarks;
+
+        private IVodInfoService infoService;
+        public VideoPlayViewModel()
+        {
+            infoService = Locator.Current.GetService<IVodInfoService>();
         }
 
+        public async void Play(SmallVodModel vod)
+        {
+            Vod.vod_id = vod.vod_id;
+            Vod.vod_name = vod.vod_name;
+            Vod.vod_content = vod.vod_content;
+            Vod.vod_pic = vod.vod_pic;
+            Vod.vod_remarks = vod.vod_remarks;
 
+            await infoService.DetailsAsync(vod.vod_id);
+        }
 
+        public void Stop()
+        {
+
+        }
 
     }
 }
diff --git a/PeachPlayer/ViewModels/VideoViewModel.cs b/PeachPlayer/ViewModels/VideoViewModel.cs
@@ -1,22 +1,22 @@
 using Peach.Model.Models;
+using PeachPlayer.Services;
 using ReactiveUI;
+using Splat;
 using System.Reactive;
-using System.Reactive.Linq;
 
 namespace PeachPlayer.ViewModels
 {
     public class VideoViewModel : ViewModelBase
     {
 
-        public Interaction<VideoPlayViewModel, SmallVodModel?> ShowDialog { get; }
         public ReactiveCommand<Unit, Unit> PlayVodCommand { get; }
         private readonly SmallVodModel Vod;
-
+        private readonly IPlayerService player;
         public VideoViewModel(SmallVodModel vod)
         {
             Vod = vod;
-            ShowDialog = new Interaction<VideoPlayViewModel, SmallVodModel?>();
             PlayVodCommand = ReactiveCommand.Create(PlayVod);
+            player = Locator.Current.GetService<IPlayerService>();
         }
 
         public string Vid => Vod.vod_id;
@@ -30,7 +30,7 @@ public async void PlayVod()
         {
             if (Vod.vod_id != null)
             {
-                var result = await ShowDialog.Handle(new VideoPlayViewModel(Vod));
+                player.Play(Vod);
             }
         }
 

diff --git a/PeachPlayer/Views/VideoPlayView.axaml b/PeachPlayer/Views/VideoPlayView.axaml
@@ -6,14 +6,38 @@
 		xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions"
 		xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        TransparencyLevelHint="AcrylicBlur"
-        ExtendClientAreaToDecorationsHint="True"
 		xmlns:vm="using:PeachPlayer.ViewModels"
 		x:DataType="vm:VideoPlayViewModel"
         x:Class="PeachPlayer.Views.VideoPlayView"
         Title="VideoPlayView">
 
+	<Grid ColumnDefinitions="*,260">
+		<Border>
+			<Border.Background>
+				<ImageBrush Source="/Assets/Images/bg-player.jpg" Stretch="UniformToFill"/>
+			</Border.Background>
+		</Border>
 
+		<StackPanel Grid.Column="1" Margin="10,0">
+			<DockPanel Margin="0,15">
+				<CheckBox Content="追剧" Width="60" Height="30" DockPanel.Dock="Right" VerticalAlignment="Center"/>
+				<TextBlock FontSize="20" FontWeight="Black" FontStretch="Expanded" Text="{Binding VodName}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+			</DockPanel>
+			<Expander>
+				<Expander.Header>
+					<TextBlock Text="{Binding VodContent}" TextTrimming="CharacterEllipsis" />
+				</Expander.Header>
+				<Grid RowDefinitions="*,*" ColumnDefinitions="150,*">
+					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"/>
+					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"/>
+					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"/>
+				</Grid>
+			</Expander>
+			<TabControl>
+				<TabItem Header="线路1"/>
+				<TabItem Header="线路2"/>
+			</TabControl>
+		</StackPanel>
 
-	Welcome to Avalonia!
+	</Grid>
 </Window>