Merge remote-tracking branch 'upstream/main'

lib/pages/video/detail/controller.dart

@@ -229,9 +229,11 @@ class VideoDetailController extends GetxController
       seekTo: seekToTime ?? defaultST,
       duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
       // 宽>高 水平 否则 垂直
-      direction: (firstVideo.width! - firstVideo.height!) > 0
-          ? 'horizontal'
-          : 'vertical',
+      direction: firstVideo.width != null && firstVideo.height != null
+          ? ((firstVideo.width! - firstVideo.height!) > 0
+              ? 'horizontal'
+              : 'vertical')
+          : null,
       bvid: bvid,
       cid: cid.value,
       enableHeart: enableHeart,
@@ -252,14 +254,19 @@ class VideoDetailController extends GetxController
     var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
     if (result['status']) {
       data = result['data'];
-      if (data.dash == null) {
-        // isEffective.value = false;
-        if (data.acceptDesc != null) {
-          SmartDialog.showToast('当前视频acceptDesc为：${data.acceptDesc}，不支持获取视频链接');
-        } else {
-          SmartDialog.showToast('当前视频未能获取视频链接');
+      if (data.acceptDesc!.isNotEmpty && data.acceptDesc!.contains('试看')) {
+        SmartDialog.showToast(
+          '该视频为专属视频，仅提供试看',
+          displayTime: const Duration(seconds: 3),
+        );
+        videoUrl = data.durl!.first.url!;
+        audioUrl = '';
+        defaultST = Duration.zero;
+        firstVideo = VideoItem();
+        if (autoPlay.value) {
+          await playerInit();
+          isShowCover.value = false;
         }
-        result['status'] = false;
         return result;
       }
       final List<VideoItem> allVideosList = data.dash!.video!;

lib/pages/video/detail/view.dart

@@ -227,7 +227,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   @override
   // 返回当前页面时
   void didPopNext() async {
-    setState(() => isShowing = true);
+    if (plPlayerController != null &&
+        plPlayerController!.videoPlayerController != null) {
+      setState(() => isShowing = true);
+    }
     videoDetailController.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
     videoDetailController