修复在播放结束后有时会卡死的问题 (#1067)

Richasy · Apr 17, 2022 · 8f0c81c · 8f0c81c
1 parent 3d806c3
commit 8f0c81c
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/src/App/Controls/Player/BiliPlayerTransportControls/BiliPlayerTransportControls.cs b/src/App/Controls/Player/BiliPlayerTransportControls/BiliPlayerTransportControls.cs
@@ -216,7 +216,7 @@ protected override void OnPointerExited(PointerRoutedEventArgs e)
 
             if (IsControlPanelShown() && e.Pointer.PointerDeviceType == Windows.Devices.Input.PointerDeviceType.Mouse)
             {
-                HideControls();
+                HideControlsAsync();
             }
 
             _cursorStayTime = 0;
@@ -484,7 +484,11 @@ private void OnRequestClearDanmaku(object sender, EventArgs e)
             _segmentIndex = 1;
             _danmakuDictionary.Clear();
             _danmakuTimer.Stop();
-            _danmakuView.ClearAll();
+
+            if (_danmakuView != null)
+            {
+                _danmakuView.ClearAll();
+            }
         }
 
         private void OnMediaPlayerUdpated(object sender, EventArgs e)
@@ -502,11 +506,11 @@ private void OnDanmakuViewModelPropertyChanged(object sender, PropertyChangedEve
             {
                 CheckDanmakuZoom();
             }
-            else if (e.PropertyName == nameof(DanmakuViewModel.DanmakuArea))
+            else if (e.PropertyName == nameof(DanmakuViewModel.DanmakuArea) && _danmakuView != null)
             {
                 _danmakuView.DanmakuArea = DanmakuViewModel.DanmakuArea;
             }
-            else if (e.PropertyName == nameof(DanmakuViewModel.DanmakuSpeed))
+            else if (e.PropertyName == nameof(DanmakuViewModel.DanmakuSpeed) && _danmakuView != null)
             {
                 _danmakuView.DanmakuDuration = Convert.ToInt32((2.1 - DanmakuViewModel.DanmakuSpeed) * 10);
             }
@@ -556,16 +560,16 @@ await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
             {
                 if (sender.PlaybackState == MediaPlaybackState.Buffering)
                 {
-                    _danmakuView.PauseDanmaku();
+                    _danmakuView?.PauseDanmaku();
                 }
                 else if (sender.PlaybackState == MediaPlaybackState.Paused && sender.Position < sender.NaturalDuration)
                 {
-                    _danmakuView.PauseDanmaku();
+                    _danmakuView?.PauseDanmaku();
                 }
                 else if (sender.PlaybackState == MediaPlaybackState.Playing)
                 {
-                    _danmakuView.ResumeDanmaku();
-                    HideControls();
+                    _danmakuView?.ResumeDanmaku();
+                    HideControlsAsync();
                 }
 
                 _playPauseButton?.Focus(FocusState.Programmatic);
@@ -797,7 +801,7 @@ await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
                         foreach (var item in data)
                         {
-                            _danmakuView.AddScreenDanmaku(item, false);
+                            _danmakuView?.AddScreenDanmaku(item, false);
                         }
                     });
                 }
@@ -814,19 +818,19 @@ private void OnCursorTimerTickAsync(object sender, object e)
             {
                 if (_isTouch && IsControlPanelShown())
                 {
-                    HideControls();
+                    HideControlsAsync();
                 }
                 else if (IsCursorInMediaElement() && !IsCursorInControlPanel())
                 {
                     Window.Current.CoreWindow.PointerCursor = null;
                     if (IsControlPanelShown())
                     {
-                        HideControls();
+                        HideControlsAsync();
                     }
                 }
                 else if (!ViewModel.IsPointerInMediaElement && IsControlPanelShown())
                 {
-                    HideControls();
+                    HideControlsAsync();
                 }
 
                 _cursorStayTime = 0;
@@ -1120,10 +1124,13 @@ private bool IsCursorInMediaElement()
             return rootBounds.Contains(pointerPosition);
         }
 
-        private void HideControls()
+        private async void HideControlsAsync()
         {
-            Hide();
-            ViewModel.IsFocusInputControl = false;
+            await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+            {
+                Hide();
+                ViewModel.IsFocusInputControl = false;
+            });
         }
     }
 }