Merge branch 'fix' into alpha

lib/pages/video/detail/controller.dart

@@ -167,7 +167,13 @@ class VideoDetailController extends GetxController
     playerInit();
   }
 
-  Future playerInit({video, audio, seekToTime, duration}) async {
+  Future playerInit({
+    video,
+    audio,
+    seekToTime,
+    duration,
+    bool autoplay = true,
+  }) async {
     /// 设置/恢复 屏幕亮度
     if (brightness != null) {
       ScreenBrightness().setScreenBrightness(brightness!);
@@ -199,6 +205,7 @@ class VideoDetailController extends GetxController
       cid: cid,
       enableHeart: enableHeart,
       isFirstTime: isFirstTime,
+      autoplay: autoplay,
     );
   }
 

lib/pages/video/detail/view.dart

@@ -102,6 +102,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     plPlayerController!.play();
   }
 
+  /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
     await videoDetailController.playerInit();
     plPlayerController = videoDetailController.plPlayerController;
@@ -111,8 +112,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   @override
   void dispose() {
-    plPlayerController!.removeStatusLister(playerListener);
-    plPlayerController!.dispose();
+    if (plPlayerController != null) {
+      plPlayerController!.removeStatusLister(playerListener);
+      plPlayerController!.dispose();
+    }
     super.dispose();
   }
 
@@ -134,9 +137,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   // 返回当前页面时
   void didPopNext() async {
     videoDetailController.isFirstTime = false;
-    videoDetailController.playerInit();
+    bool autoplay =
+        setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
+    videoDetailController.playerInit(autoplay: autoplay);
+    videoDetailController.autoPlay.value = true;
     videoIntroController.isPaused = false;
-    if (_extendNestCtr.position.pixels == 0) {
+    if (_extendNestCtr.position.pixels == 0 && autoplay) {
       await Future.delayed(const Duration(milliseconds: 300));
       plPlayerController!.play();
     }