Merge pull request guozhigq#376 from orz12/main

fix: 修复未开启自动播放页面异常，增加全屏隐藏进度条
zzhangdi · Jan 2, 2024 · 5d51b23 · 5d51b23
2 parents bc7aa8c + 9ae0e92
commit 5d51b23
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
@@ -302,7 +302,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 return <Widget>[
                   Obx(() => SliverAppBar(
                       automaticallyImplyLeading: false,
-                      pinned: false,
+                      // 假装使用一个非空变量，避免Obx检测不到而罢工
+                      pinned: videoDetailController
+                          .autoPlay.value ^ false ^ videoDetailController
+                          .autoPlay.value,
                       elevation: 0,
                       scrolledUnderElevation: 0,
                       forceElevated: innerBoxIsScrolled,

diff --git a/lib/plugin/pl_player/models/bottom_progress_behavior.dart b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
@@ -3,14 +3,15 @@ enum BtmProgresBehavior {
   alwaysShow,
   alwaysHide,
   onlyShowFullScreen,
+  onlyHideFullScreen,
 }
 
 extension BtmProgresBehaviorDesc on BtmProgresBehavior {
-  String get description => ['始终展示', '始终隐藏', '仅全屏时展示'][index];
+  String get description => ['始终展示', '始终隐藏', '仅全屏时展示', '仅全屏时隐藏'][index];
 }
 
 extension BtmProgresBehaviorCode on BtmProgresBehavior {
-  static final List<int> _codeList = [0, 1, 2];
+  static final List<int> _codeList = [0, 1, 2, 3];
   int get code => _codeList[index];
 
   static BtmProgresBehavior? fromCode(int code) {

diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
@@ -610,6 +610,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     BtmProgresBehavior.onlyShowFullScreen.code &&
                 !_.isFullScreen.value) {
               return Container();
+            } else if (defaultBtmProgressBehavior ==
+                    BtmProgresBehavior.onlyHideFullScreen.code &&
+                _.isFullScreen.value) {
+              return Container();
             }
 
             if (_.videoType.value == 'live') {