Merge pull request #136 from ywmoyue/dev

4.6.2
ywmoyue · May 27, 2023 · bbf96b2 · bbf96b2
2 parents 7bc7f4e + e81b7c0
commit bbf96b2
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 31 deletions.
diff --git a/document/new_version.json b/document/new_version.json
@@ -1,7 +1,7 @@
 {
-    "version": "4.6.1",
-    "version_num": 40601,
-    "version_desc": "更新内容:\r\n\r\n* 视频详情页添加合集视频到播放列表Tab中\r\n\r\n* 视频动态页右下角显示视频时长\r\n\r\n* 支持设置按住倍速播放手势\r\n\r\n* 修复查询用户资料及投稿无权限错误\r\n\r\n\r\n 如果无法打开下载地址，请访问:https://github.com/ywmoyue/biliuwp-lite/releases",
+    "version": "4.6.2",
+    "version_num": 40602,
+    "version_desc": "更新内容:\r\n\r\n* 进入有合集的视频中不自动切换到播放列表中\r\n\r\n* 修复播放视频时不会保持屏幕常亮\r\n\r\n* 修复部分合集视频无法打开问题\r\n\r\n* 修复播放器中点击鼠标中键/侧键不执行操作问题\r\n\r\n\r\n 如果无法打开下载地址，请访问:https://github.com/ywmoyue/biliuwp-lite/releases",
     "url": "https://github.com/ywmoyue/biliuwp-lite/releases",
     "download_url": "https://github.com/ywmoyue/biliuwp-lite/releases"
 }
diff --git a/src/BiliLite.Packages/Package.appxmanifest b/src/BiliLite.Packages/Package.appxmanifest
@@ -14,7 +14,7 @@
   <Identity
      Name="5422.502643927C6AD"
     Publisher="CN=muyan"
-    Version="4.6.1.0" />
+    Version="4.6.2.0" />
   <mp:PhoneIdentity PhoneProductId="8bceed6a-7e89-4141-a693-923401d5b2ac" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>

diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs
@@ -1805,6 +1805,13 @@ private void Grid_PointerPressed(object sender, PointerRoutedEventArgs e)
         {
             try
             {
+                var par = e.GetCurrentPoint(sender as Frame).Properties.PointerUpdateKind;
+                if (SettingService.GetValue(SettingConstants.UI.MOUSE_MIDDLE_ACTION, (int)MouseMiddleActions.Back) == (int)MouseMiddleActions.Back
+                && par == Windows.UI.Input.PointerUpdateKind.XButton1Pressed || par == Windows.UI.Input.PointerUpdateKind.MiddleButtonPressed)
+                {
+                    MessageCenter.GoBack(this);
+                    return;
+                }
                 var ps = e.GetIntermediatePoints(null);
                 if (ps != null && ps.Count > 0 && HandlingGesture != true)
                 {
@@ -2082,7 +2089,7 @@ private void Player_PlayStateChanged(object sender, PlayState e)
                     BottomBtnPause.Visibility = Visibility.Collapsed;
                     break;
                 case PlayState.Playing:
-                    KeepScreenOn(false);
+                    KeepScreenOn(true);
                     if (_systemMediaTransportControls != null)
                     {
                         _systemMediaTransportControls.PlaybackStatus = MediaPlaybackStatus.Playing;

diff --git a/src/BiliLite.UWP/MainPage.xaml.cs b/src/BiliLite.UWP/MainPage.xaml.cs
@@ -35,9 +35,15 @@ public MainPage()
             MessageCenter.ChangeTitleEvent += MessageCenter_ChangeTitleEvent;
             MessageCenter.ViewImageEvent += MessageCenter_ViewImageEvent;
             MessageCenter.MiniWindowEvent += MessageCenter_MiniWindowEvent;
+            MessageCenter.GoBackEvent += MessageCenter_GoBackEvent;
             // Window.Current.Content.PointerPressed += Content_PointerPressed;
         }
 
+        private void MessageCenter_GoBackEvent(object sender, EventArgs e)
+        {
+            GoBack();
+        }
+
         private void MessageCenter_MiniWindowEvent(object sender, bool e)
         {
             if (e)
@@ -114,32 +120,36 @@ private void Content_PointerPressed(object sender, PointerRoutedEventArgs e)
             if (SettingService.GetValue(SettingConstants.UI.MOUSE_MIDDLE_ACTION, (int)MouseMiddleActions.Back) == (int)MouseMiddleActions.Back
                 && e.IsUseMiddleButton(sender))
             {
-                //如果打开了图片浏览，则关闭图片浏览
-                if (gridViewer.Visibility == Visibility.Visible)
+                GoBack();
+                e.Handled = true;
+
+            }
+        }
+
+        private void GoBack()
+        {
+            //如果打开了图片浏览，则关闭图片浏览
+            if (gridViewer.Visibility == Visibility.Visible)
+            {
+                imgViewer_CloseEvent(this, null);
+                return;
+            }
+
+            //处理多标签
+            if (tabView.SelectedItem != tabView.TabItems[0])
+            {
+                var frame = (tabView.SelectedItem as TabViewItem).Content as MyFrame;
+                if (frame.CanGoBack)
                 {
-                    imgViewer_CloseEvent(this, null);
-                    e.Handled = true;
-                    return;
+                    frame.Close();
+                    frame.GoBack();
                 }
-
-                //处理多标签
-                if (tabView.SelectedItem != tabView.TabItems[0])
+                else
                 {
-                    var frame = (tabView.SelectedItem as TabViewItem).Content as MyFrame;
-                    if (frame.CanGoBack)
-                    {
-                        frame.Close();
-                        frame.GoBack();
-                    }
-                    else
-                    {
-                        ClosePage(tabView.SelectedItem as TabViewItem);
-                        //frame.Close();
-                        //tabView.TabItems.Remove(tabView.SelectedItem);
-                    }
-                    e.Handled = true;
+                    ClosePage(tabView.SelectedItem as TabViewItem);
+                    //frame.Close();
+                    //tabView.TabItems.Remove(tabView.SelectedItem);
                 }
-
             }
         }
 

diff --git a/src/BiliLite.UWP/Models/Common/Video/VideoUgcSeasonSectionEpisode.cs b/src/BiliLite.UWP/Models/Common/Video/VideoUgcSeasonSectionEpisode.cs
@@ -17,7 +17,7 @@ public class VideoUgcSeasonSectionEpisode
         [JsonProperty("cover_right_text")]
         public string CovverRightText { get; set; }
 
-        public int Page { get; set; }
+        //public int Page { get; set; }
 
         public string Part { get; set; }
 

diff --git a/src/BiliLite.UWP/Pages/VideoDetailPage.xaml.cs b/src/BiliLite.UWP/Pages/VideoDetailPage.xaml.cs
@@ -43,6 +43,8 @@ public sealed partial class VideoDetailPage : PlayPage
         string avid = "";
         string bvid = "";
         bool is_bvid = false;
+        private bool isFirstUgcSeasonVideo = false;
+
         public VideoDetailPage()
         {
             this.InitializeComponent();
@@ -238,6 +240,7 @@ private void InitPlayInfo()
 
         private void InitUgcSeason(string id)
         {
+            isFirstUgcSeasonVideo = true;
             playlist = new VideoPlaylist()
             {
                 Playlist = new List<VideoPlaylistItem>()
@@ -250,7 +253,7 @@ private void InitUgcSeason(string id)
                     {
                         ID = item.Aid,
                         Title = item.Title,
-                        Author = item.Author.Name,
+                        Author = item?.Author?.Name,
                         Cover = item.Cover
                     });
                 }
@@ -262,7 +265,6 @@ private void InitUgcSeason(string id)
             var listView = element.Content as ListView;
             listView.SelectedIndex = episodeIndex;
             pivot.Items.Insert(0, element);
-            pivot.SelectedIndex = 0;
         }
 
         private void CreateQR()
@@ -553,7 +555,11 @@ private void BtnWatchLater_Click(object sender, RoutedEventArgs e)
 
         private async void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-
+            if (isFirstUgcSeasonVideo)
+            {
+                isFirstUgcSeasonVideo = false;
+                return;
+            }
             var liveView = sender as ListView;
             if (liveView.SelectedItem == null) return;
             var item = liveView.SelectedItem as VideoPlaylistItem;

diff --git a/src/BiliLite.UWP/Services/MessageCenter.cs b/src/BiliLite.UWP/Services/MessageCenter.cs
@@ -32,6 +32,7 @@ public static class MessageCenter
         public static event EventHandler<string> ChangeTitleEvent;
         public static event EventHandler<object> LoginedEvent;
         public static event EventHandler<ImageViewerParameter> ViewImageEvent;
+        public static event EventHandler GoBackEvent;
         public static event EventHandler LogoutedEvent;
         public static void NavigateToPage(object sender, NavigationInfo navigationInfo)
         {
@@ -45,6 +46,12 @@ public static void ChangeTitle(BasePage page, string title)
         {
             ChangeTitleEvent?.Invoke(page, title);
         }
+
+        public static void GoBack(object sender)
+        {
+            GoBackEvent?.Invoke(sender, EventArgs.Empty);
+        }
+
         /// <summary>
         /// 发送登录完成事件
         /// </summary>