появляющийся плеер
This commit is contained in:
@@ -7,20 +7,19 @@
|
|||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject HttpClient Http
|
@inject HttpClient Http
|
||||||
|
|
||||||
<MudPaper Class="pa-2 rounded" Elevation="0" Width="100%" Style="background-color: rgba(0,0,0,0.05);">
|
<MudStack Spacing="1" Row AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap">
|
||||||
<MudStack Spacing="1" Row AlignItems="AlignItems.Center" Wrap="Wrap.Wrap">
|
|
||||||
<!-- Кнопки управления -->
|
<!-- Кнопки управления -->
|
||||||
<MudItem @onmouseenter="() => { _isPlayHovered = true; }"
|
<MudItem @onmouseenter="() => { _isPlayHovered = true; }"
|
||||||
@onmouseleave="() => { _isPlayHovered = false; }"
|
@onmouseleave="() => { _isPlayHovered = false; }"
|
||||||
Class="relative d-inline-block rounded-sm overflow-hidden cursor-pointer"
|
Class="relative d-inline-block rounded overflow-hidden cursor-pointer"
|
||||||
Style="width: 50px; height: 50px;">
|
Style="width: 50px; height: 50px;">
|
||||||
|
|
||||||
@if (!string.IsNullOrEmpty(AudioPlayerService.CurrentTrack?.CoverUri))
|
@if (!string.IsNullOrEmpty(AudioPlayerService.CurrentTrack?.CoverUri))
|
||||||
{
|
{
|
||||||
<MudImage Src="@AudioPlayerService.CurrentTrack.CoverUri.FormatCoverUrl(50, 50)" Height="50" Width="50" Class="rounded-l-sm d-block" />
|
<MudImage Src="@AudioPlayerService.CurrentTrack.CoverUri.FormatCoverUrl(50, 50)" Height="50" Width="50" Class="rounded d-block" />
|
||||||
}
|
}
|
||||||
|
|
||||||
<MudItem Class="absolute d-flex align-center justify-center rounded-sm"
|
<MudItem Class="absolute d-flex align-center justify-center rounded"
|
||||||
Style="top: 0; left: 0; right: 0; bottom: 0; background: transparent;">
|
Style="top: 0; left: 0; right: 0; bottom: 0; background: transparent;">
|
||||||
<MudToggleIconButton Toggled="@AudioPlayerService.IsPlaying"
|
<MudToggleIconButton Toggled="@AudioPlayerService.IsPlaying"
|
||||||
Icon="@Icons.Material.Filled.PlayArrow"
|
Icon="@Icons.Material.Filled.PlayArrow"
|
||||||
@@ -35,7 +34,7 @@
|
|||||||
<!-- Название и прогресс -->
|
<!-- Название и прогресс -->
|
||||||
@if (AudioPlayerService.CurrentTrack != null)
|
@if (AudioPlayerService.CurrentTrack != null)
|
||||||
{
|
{
|
||||||
<MudStack Spacing="0" AlignItems="AlignItems.Stretch" Class="d-flex flex-grow-1 relative overflow-hidden align-center rounded-sm" Style="height: 50px;">
|
<MudStack Spacing="0" AlignItems="AlignItems.Stretch" Class="d-flex flex-grow-1 relative overflow-hidden align-center rounded" Style="height: 50px;">
|
||||||
<MudItem Class="absolute" style="top: 0; left: 0; right: 0; bottom: 0; z-index: 1;">
|
<MudItem Class="absolute" style="top: 0; left: 0; right: 0; bottom: 0; z-index: 1;">
|
||||||
<TrackProgress Value="@AudioPlayerService.CurrentTime"
|
<TrackProgress Value="@AudioPlayerService.CurrentTime"
|
||||||
Min="0" Max="@AudioPlayerService.TotalTime"
|
Min="0" Max="@AudioPlayerService.TotalTime"
|
||||||
@@ -49,12 +48,12 @@
|
|||||||
ValueChanged="SeekTo" />
|
ValueChanged="SeekTo" />
|
||||||
</MudItem>
|
</MudItem>
|
||||||
<MudStack Spacing="0" Row AlignItems="AlignItems.Center" Class="px-3 relative pointer-events-none" Style="z-index: 2; width: 100%; height: 100%;">
|
<MudStack Spacing="0" Row AlignItems="AlignItems.Center" Class="px-3 relative pointer-events-none" Style="z-index: 2; width: 100%; height: 100%;">
|
||||||
<MudStack AlignItems="AlignItems.Start" Spacing="0">
|
<MudStack AlignItems="AlignItems.Start" Spacing="0" Style="min-width: 0; width: 100%;">
|
||||||
<MudText Typo="Typo.body2" Color="Color.Default" Style="font-weight: 600;">
|
<MudText Typo="Typo.body2" Inline Color="Color.Default" Style="font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
|
||||||
@AudioPlayerService.CurrentTrack.Title
|
@AudioPlayerService.CurrentTrack.Title
|
||||||
</MudText>
|
</MudText>
|
||||||
|
|
||||||
<MudText Typo="Typo.body2" Style="font-weight: 600;">
|
<MudText Typo="Typo.body2" Inline Color="Color.Default" Style="font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
|
||||||
@string.Join(", ", AudioPlayerService.CurrentTrack.Artists.Select(a => a.Name))
|
@string.Join(", ", AudioPlayerService.CurrentTrack.Artists.Select(a => a.Name))
|
||||||
</MudText>
|
</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
@@ -96,7 +95,6 @@
|
|||||||
</MudItem>
|
</MudItem>
|
||||||
</MudHidden>
|
</MudHidden>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudPaper>
|
|
||||||
|
|
||||||
<audio id="@_audioId" style="display: none;"></audio>
|
<audio id="@_audioId" style="display: none;"></audio>
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,6 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: var(--track-height);
|
height: var(--track-height);
|
||||||
background-color: var(--mud-palette-action-disabled-background, rgba(0,0,0,0.1));
|
background-color: var(--mud-palette-action-disabled-background, rgba(0,0,0,0.1));
|
||||||
border-radius: 4px;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,8 +15,10 @@
|
|||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@inject AuthenticationStateProvider AuthProvider
|
@inject AuthenticationStateProvider AuthProvider
|
||||||
@inject IDialogService DialogService
|
@inject IDialogService DialogService
|
||||||
|
@inject IAudioPlayerService AudioPlayerService
|
||||||
|
@implements IDisposable
|
||||||
|
|
||||||
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="py-1" Style="height: 100%;">
|
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="py-1 px-1" Style="height: 100%;">
|
||||||
<MudStack Style="height: 100%;" StretchItems="StretchItems.Start" Spacing="0">
|
<MudStack Style="height: 100%;" StretchItems="StretchItems.Start" Spacing="0">
|
||||||
@*Первый элемент растянется на всю высоту*@
|
@*Первый элемент растянется на всю высоту*@
|
||||||
<MudItem Style="min-height: 0; height: 100%;">
|
<MudItem Style="min-height: 0; height: 100%;">
|
||||||
@@ -128,9 +130,9 @@
|
|||||||
</MudItem>
|
</MudItem>
|
||||||
|
|
||||||
@*Второй элемент - плеер. Привязан к нижней части контейнера*@
|
@*Второй элемент - плеер. Привязан к нижней части контейнера*@
|
||||||
<MudItem>
|
<MudCollapse Expanded="@(AudioPlayerService.CurrentTrackId != null)" >
|
||||||
<AudioPlayer />
|
<AudioPlayer />
|
||||||
</MudItem>
|
</MudCollapse>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudContainer>
|
</MudContainer>
|
||||||
|
|
||||||
@@ -411,6 +413,13 @@
|
|||||||
_currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
|
_currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
|
||||||
await LoadPlaylist();
|
await LoadPlaylist();
|
||||||
await LoadTracks();
|
await LoadTracks();
|
||||||
|
AudioPlayerService.OnStartedTrack += OnPlayerStateChanged;
|
||||||
|
AudioPlayerService.OnEndedTrack += OnPlayerStateChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPlayerStateChanged()
|
||||||
|
{
|
||||||
|
InvokeAsync(StateHasChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Установка разрешений.</summary>
|
/// <summary>Установка разрешений.</summary>
|
||||||
@@ -793,4 +802,10 @@
|
|||||||
var result = await dialog.Result;
|
var result = await dialog.Result;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
AudioPlayerService.OnStartedTrack -= OnPlayerStateChanged;
|
||||||
|
AudioPlayerService.OnEndedTrack -= OnPlayerStateChanged;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -41,6 +41,8 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
public string TotalTimeString => _totalTimeString;
|
public string TotalTimeString => _totalTimeString;
|
||||||
|
|
||||||
public event Action? OnStateChanged;
|
public event Action? OnStateChanged;
|
||||||
|
public event Action? OnStartedTrack;
|
||||||
|
public event Action? OnEndedTrack;
|
||||||
|
|
||||||
public AudioPlayerService(TokenStorage tokenStorage, ISnackbar snackbar, HttpClient httpClient, PlayerStorage playerStorage)
|
public AudioPlayerService(TokenStorage tokenStorage, ISnackbar snackbar, HttpClient httpClient, PlayerStorage playerStorage)
|
||||||
{
|
{
|
||||||
@@ -105,6 +107,7 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
_isPlaying = true;
|
_isPlaying = true;
|
||||||
OnStateChanged?.Invoke();
|
OnStateChanged?.Invoke();
|
||||||
OnLoadAndPlayRequested?.Invoke(trackId, accessToken, playlistShareToken);
|
OnLoadAndPlayRequested?.Invoke(trackId, accessToken, playlistShareToken);
|
||||||
|
OnStartedTrack?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task PlayAsync()
|
public async Task PlayAsync()
|
||||||
@@ -112,6 +115,7 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
_isPlaying = true;
|
_isPlaying = true;
|
||||||
OnStateChanged?.Invoke();
|
OnStateChanged?.Invoke();
|
||||||
OnPlayRequested?.Invoke();
|
OnPlayRequested?.Invoke();
|
||||||
|
OnStartedTrack?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task PauseAsync()
|
public async Task PauseAsync()
|
||||||
@@ -175,6 +179,7 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
_totalTime = 0;
|
_totalTime = 0;
|
||||||
_currentTimeString = "0:00";
|
_currentTimeString = "0:00";
|
||||||
OnStateChanged?.Invoke();
|
OnStateChanged?.Invoke();
|
||||||
|
OnEndedTrack?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -66,6 +66,10 @@ public interface IAudioPlayerService
|
|||||||
/// Подписывайтесь на него, чтобы перерисовывать UI (например, иконку "пауза/плей").
|
/// Подписывайтесь на него, чтобы перерисовывать UI (например, иконку "пауза/плей").
|
||||||
/// </summary>
|
/// </summary>
|
||||||
event Action? OnStateChanged;
|
event Action? OnStateChanged;
|
||||||
|
|
||||||
|
event Action? OnStartedTrack;
|
||||||
|
|
||||||
|
event Action? OnEndedTrack;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region События для связи с реальным компонентом AudioPlayer (Эти события вызываются сервисом)
|
#region События для связи с реальным компонентом AudioPlayer (Эти события вызываются сервисом)
|
||||||
|
|||||||
Reference in New Issue
Block a user