修复重复进入直播间无法播放的问题 (#300)

Richasy · Sep 25, 2021 · 859ed02 · 859ed02
1 parent 427cebd
commit 859ed02
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 28 deletions.
diff --git a/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Methods.cs b/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Methods.cs
@@ -145,37 +145,34 @@ private async Task LoadPgcDetailAsync(int episodeId, int seasonId = 0, bool isRe
             await ChangePgcEpisodeAsync(id);
         }
 
-        private async Task LoadLiveDetailAsync(int roomId, bool isRefresh)
+        private async Task LoadLiveDetailAsync(int roomId)
         {
-            if (_liveDetail == null || RoomId != roomId.ToString() || isRefresh)
-            {
-                Reset();
-                IsLive = true;
-                IsDetailLoading = true;
-                IsShowReply = false;
-                RoomId = roomId.ToString();
+            Reset();
+            IsLive = true;
+            IsDetailLoading = true;
+            IsShowReply = false;
+            RoomId = roomId.ToString();
 
-                try
-                {
-                    var detail = await Controller.GetLiveRoomDetailAsync(roomId);
-                    _liveDetail = detail;
-                }
-                catch (Exception ex)
-                {
-                    IsDetailError = true;
-                    DetailErrorText = _resourceToolkit.GetLocaleString(LanguageNames.RequestLiveFailed) + $"\n{ex.Message}";
-                    IsDetailLoading = false;
-                    return;
-                }
-
-                InitializeLiveDetail();
+            try
+            {
+                var detail = await Controller.GetLiveRoomDetailAsync(roomId);
+                _liveDetail = detail;
+            }
+            catch (Exception ex)
+            {
+                IsDetailError = true;
+                DetailErrorText = _resourceToolkit.GetLocaleString(LanguageNames.RequestLiveFailed) + $"\n{ex.Message}";
                 IsDetailLoading = false;
-
-                await InitializeUserRelationAsync();
-                await Controller.ConnectToLiveRoomAsync(roomId);
-                await ChangeLiveQualityAsync(4);
-                await Controller.SendLiveHeartBeatAsync();
+                return;
             }
+
+            InitializeLiveDetail();
+            IsDetailLoading = false;
+
+            await InitializeUserRelationAsync();
+            await Controller.ConnectToLiveRoomAsync(roomId);
+            await ChangeLiveQualityAsync(4);
+            await Controller.SendLiveHeartBeatAsync();
         }
 
         private void InitializeVideoDetail()

diff --git a/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.cs b/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.cs
@@ -129,7 +129,7 @@ public async Task LoadAsync(object vm, bool isRefresh = false)
                     await LoadPgcDetailAsync(Convert.ToInt32(videoId), seasonId, isRefresh);
                     break;
                 case VideoType.Live:
-                    await LoadLiveDetailAsync(Convert.ToInt32(videoId), isRefresh);
+                    await LoadLiveDetailAsync(Convert.ToInt32(videoId));
                     break;
                 default:
                     break;