Merge branch 'opt-videodetail-widget-flicker'

orz12 · Jan 15, 2024 · cb8982f · cb8982f
2 parents 0d3d304 + 02bdb46
commit cb8982f
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 103 deletions.
diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart
@@ -414,14 +414,18 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                             ),
                           ),
                           const Spacer(),
-                          AnimatedOpacity(
-                            opacity: loadingStatus ? 0 : 1,
-                            duration: const Duration(milliseconds: 150),
-                            child: SizedBox(
-                              height: 32,
-                              child: Obx(
-                                () =>
-                                    videoIntroController.followStatus.isNotEmpty
+                          Obx(() => AnimatedOpacity(
+                                opacity: loadingStatus ||
+                                        videoIntroController
+                                            .followStatus.isEmpty
+                                    ? 0
+                                    : 1,
+                                duration: const Duration(milliseconds: 50),
+                                child: SizedBox(
+                                  height: 32,
+                                  child: Obx(
+                                    () => videoIntroController
+                                            .followStatus.isNotEmpty
                                         ? TextButton(
                                             onPressed: videoIntroController
                                                 .actionRelationMod,
@@ -453,9 +457,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                                                 .actionRelationMod,
                                             child: const Text('关注'),
                                           ),
-                              ),
-                            ),
-                          ),
+                                  ),
+                                ),
+                              )),
                         ],
                       ),
                     ),

diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
@@ -392,107 +392,98 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                       },
                                     ),
 
-                                    Obx(
-                                      () => Visibility(
-                                        visible: videoDetailController
-                                            .isShowCover.value,
-                                        child: Positioned(
-                                          top: 0,
-                                          left: 0,
-                                          right: 0,
-                                          child: GestureDetector(
-                                            onTap: () {
-                                              handlePlay();
-                                            },
-                                            child: NetworkImgLayer(
-                                              type: 'emote',
-                                              src: videoDetailController
-                                                  .videoItem['pic'],
-                                              width: maxWidth,
-                                              height: maxHeight,
+                                    /// 关闭自动播放时 手动播放
+                                    if (!videoDetailController
+                                        .autoPlay.value) ...<Widget>[
+                                      Obx(
+                                        () => Visibility(
+                                          visible: videoDetailController
+                                              .isShowCover.value,
+                                          child: Positioned(
+                                            top: 0,
+                                            left: 0,
+                                            right: 0,
+                                            child: GestureDetector(
+                                              onTap: () {
+                                                handlePlay();
+                                              },
+                                              child: NetworkImgLayer(
+                                                type: 'emote',
+                                                src: videoDetailController
+                                                    .videoItem['pic'],
+                                                width: maxWidth,
+                                                height: maxHeight,
+                                              ),
                                             ),
                                           ),
                                         ),
                                       ),
-                                    ),
 
-                                    /// 关闭自动播放时 手动播放
-                                    Obx(
-                                      () => Visibility(
-                                          visible: videoDetailController
-                                                  .isShowCover.value &&
-                                              videoDetailController
-                                                  .isEffective.value &&
-                                              !videoDetailController
-                                                  .autoPlay.value,
-                                          child: Stack(
-                                            children: [
-                                              Positioned(
-                                                top: 0,
-                                                left: 0,
-                                                right: 0,
-                                                child: AppBar(
-                                                  primary: false,
-                                                  foregroundColor: Colors.white,
-                                                  elevation: 0,
-                                                  scrolledUnderElevation: 0,
-                                                  backgroundColor:
-                                                      Colors.transparent,
-                                                  actions: [
-                                                    IconButton(
-                                                      tooltip: '稍后再看',
-                                                      onPressed: () async {
-                                                        var res = await UserHttp
-                                                            .toViewLater(
-                                                                bvid:
-                                                                    videoDetailController
-                                                                        .bvid);
-                                                        SmartDialog.showToast(
-                                                            res['msg']);
-                                                      },
-                                                      icon: const Icon(Icons
-                                                          .history_outlined),
-                                                    ),
-                                                    const SizedBox(width: 14)
-                                                  ],
-                                                ),
-                                              ),
-                                              Positioned(
-                                                right: 12,
-                                                bottom: 10,
-                                                child: TextButton.icon(
-                                                  style: ButtonStyle(
-                                                    side: MaterialStateProperty
-                                                        .resolveWith(
-                                                            (states) {
-                                                      return BorderSide(
-                                                          color: Theme.of(context)
-                                                              .colorScheme
-                                                              .primary
-                                                              .withOpacity(0.5),
-                                                          width: 1);
-                                                    }),
+                                      Obx(
+                                        () => Visibility(
+                                            visible: videoDetailController
+                                                    .isShowCover.value &&
+                                                videoDetailController
+                                                    .isEffective.value,
+                                            child: Stack(
+                                              children: [
+                                                Positioned(
+                                                  top: 0,
+                                                  left: 0,
+                                                  right: 0,
+                                                  child: AppBar(
+                                                    primary: false,
+                                                    foregroundColor:
+                                                        Colors.white,
+                                                    elevation: 0,
+                                                    scrolledUnderElevation: 0,
                                                     backgroundColor:
-                                                        MaterialStateProperty
-                                                            .resolveWith(
-                                                                (states) {
-                                                      return Theme.of(context)
-                                                          .colorScheme
-                                                          .background
-                                                          .withOpacity(0.6);
-                                                    }),
+                                                        Colors.transparent,
+                                                    actions: [
+                                                      IconButton(
+                                                        tooltip: '稍后再看',
+                                                        onPressed: () async {
+                                                          var res = await UserHttp
+                                                              .toViewLater(
+                                                                  bvid:
+                                                                      videoDetailController
+                                                                          .bvid);
+                                                          SmartDialog.showToast(
+                                                              res['msg']);
+                                                        },
+                                                        icon: const Icon(Icons
+                                                            .history_outlined),
+                                                      ),
+                                                      const SizedBox(width: 14)
+                                                    ],
                                                   ),
-                                                  onPressed: () => handlePlay(),
-                                                  icon: const Icon(
-                                                    Icons.play_circle_outline,
-                                                    size: 20,
+                                                ),
+                                                Positioned(
+                                                  right: 12,
+                                                  bottom: 10,
+                                                  child: TextButton.icon(
+                                                    style: ButtonStyle(
+                                                      backgroundColor:
+                                                          MaterialStateProperty
+                                                              .resolveWith(
+                                                                  (states) {
+                                                        return Colors.white
+                                                            .withOpacity(0.8);
+                                                      }),
+                                                    ),
+                                                    onPressed: () =>
+                                                        handlePlay(),
+                                                    icon: const Icon(
+                                                      Icons.play_circle_outline,
+                                                      size: 20,
+                                                    ),
+                                                    label: const Text('轻触封面播放'),
                                                   ),
-                                                  label: const Text('轻触封面播放'),
                                                 ),
-                                              ),
-                                            ],
-                                          )),
-                                    ),
+                                              ],
+                                            )),
+                                      ),
+                                    ]
                                   ],
                                 );
                               },