修复第二次播放黑屏的问题 (#1014)

Richasy · Apr 5, 2022 · 281b3de · 281b3de
1 parent 08ecef9
commit 281b3de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Dash.cs b/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Dash.cs
@@ -24,6 +24,11 @@ private async Task InitializeOnlineDashVideoAsync()
         {
             try
             {
+                if (!AppViewModel.Instance.IsOpenPlayer)
+                {
+                    return;
+                }
+
                 var httpClient = new HttpClient();
                 httpClient.DefaultRequestHeaders.Referer = new Uri("https://www.bilibili.com");
                 httpClient.DefaultRequestHeaders.Add("User-Agent", ServiceConstants.DefaultUserAgentString);
@@ -104,6 +109,11 @@ private async Task InitializeLiveDashAsync(string url)
         {
             try
             {
+                if (!AppViewModel.Instance.IsOpenPlayer)
+                {
+                    return;
+                }
+
                 if (_interopMSS != null)
                 {
                     _interopMSS.Dispose();

diff --git a/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.cs b/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.cs
@@ -280,7 +280,6 @@ public async Task LoadAsync(CurrentPlayingRecord record, bool isRefresh = false,
             }
 
             AppViewModel.Instance.CanShowHomeButton = _historyVideoList.Count > 0;
-
             switch (_videoType)
             {
                 case VideoType.Video:
@@ -594,6 +593,7 @@ public void ClearPlayer()
                 }
 
                 _currentVideoPlayer.Source = null;
+                _currentVideoPlayer = null;
             }
 
             _lastReportProgress = TimeSpan.Zero;