Merge branch 'main' into fix

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:appscheme/appscheme.dart';
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -583,34 +582,6 @@ InlineSpan buildContent(
         builder: (BuildContext context) => InteractiveviewerGallery(
           sources: picList,
           initIndex: initIndex,
-          itemBuilder: (
-            BuildContext context,
-            int index,
-            bool isFocus,
-            bool enablePageView,
-          ) {
-            return GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                if (enablePageView) {
-                  Navigator.of(context).pop();
-                  final MainController mainController =
-                      Get.find<MainController>();
-                  mainController.imgPreviewStatus = false;
-                }
-              },
-              child: Center(
-                child: Hero(
-                  tag: picList[index] + randomInt,
-                  child: CachedNetworkImage(
-                    fadeInDuration: const Duration(milliseconds: 0),
-                    imageUrl: picList[index],
-                    fit: BoxFit.contain,
-                  ),
-                ),
-              ),
-            );
-          },
           onPageChanged: (int pageIndex) {},
           onDismissed: (int value) {
             print('onDismissed');

lib/pages/video/detail/view.dart

@@ -68,10 +68,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late final AppLifecycleListener _lifecycleListener;
   late double statusHeight;
 
-  // 稍后再看控制器
-  // late AnimationController _laterCtr;
-  // late Animation<Offset> _laterOffsetAni;
-
   @override
   void initState() {
     super.initState();
@@ -108,7 +104,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     }
     WidgetsBinding.instance.addObserver(this);
     lifecycleListener();
-    // watchLaterControllerInit();
   }
 
   // 获取视频资源，初始化播放器
@@ -242,8 +237,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     appbarStream.close();
     WidgetsBinding.instance.removeObserver(this);
     _lifecycleListener.dispose();
-    // _laterCtr.dispose();
-    // _laterOffsetAni.removeListener(() {});
     super.dispose();
   }
 
@@ -490,21 +483,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     );
   }
 
-  /// 稍后再看控制器初始化
-  // void watchLaterControllerInit() {
-  //   _laterCtr = AnimationController(
-  //     duration: const Duration(milliseconds: 300),
-  //     vsync: this,
-  //   );
-  //   _laterOffsetAni = Tween<Offset>(
-  //     begin: const Offset(0.0, 1.0),
-  //     end: Offset.zero,
-  //   ).animate(CurvedAnimation(
-  //     parent: _laterCtr,
-  //     curve: Curves.easeInOut,
-  //   ));
-  // }
-
   @override
   Widget build(BuildContext context) {
     final sizeContext = MediaQuery.sizeOf(context);