Merge branch 'main' into feature-updateVideoDetailStructure

lib/pages/rcmd/controller.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/video.dart';
@@ -106,4 +107,10 @@ class RcmdController extends GetxController {
           duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
     }
   }
+
+  void blockUserCb(mid) {
+    videoList.removeWhere((e) => e.owner.mid == mid);
+    videoList.refresh();
+    SmartDialog.showToast('已移除相关视频');
+  }
 }

lib/pages/rcmd/view.dart

@@ -146,6 +146,7 @@ class _RcmdPageState extends State<RcmdPage>
               ? VideoCardV(
                   videoItem: videoList[index],
                   crossAxisCount: crossAxisCount,
+                  blockUserCb: (mid) => ctr.blockUserCb(mid),
                 )
               : const VideoCardVSkeleton();
         },

lib/pages/video/detail/controller.dart

@@ -233,7 +233,7 @@ class VideoDetailController extends GetxController
     audio,
     seekToTime,
     duration,
-    bool autoplay = true,
+    bool? autoplay,
   }) async {
     /// 设置/恢复 屏幕亮度
     if (brightness != null) {
@@ -266,7 +266,7 @@ class VideoDetailController extends GetxController
       cid: cid.value,
       enableHeart: enableHeart,
       isFirstTime: isFirstTime,
-      autoplay: autoplay,
+      autoplay: autoplay ?? autoPlay.value,
     );
 
     /// 开启自动全屏时，在player初始化完成后立即传入headerControl

lib/pages/video/detail/view.dart

@@ -176,7 +176,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
-    await vdCtr.playerInit();
+    await vdCtr.playerInit(autoplay: true);
     plPlayerController = vdCtr.plPlayerController;
     plPlayerController!.addStatusLister(playerListener);
     vdCtr.autoPlay.value = true;
@@ -266,7 +266,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     }
     vdCtr.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
-    vdCtr.playerInit(autoplay: autoplay);
+    vdCtr.playerInit();
 
     /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回
     vdCtr.autoPlay.value = !vdCtr.isShowCover.value;