diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index acd10058..4cbf800e 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -59,17 +59,8 @@ class FavVideoCardH extends StatelessWidget { } } - Map parameters = { - 'bvid': bvid, - 'cid': videoItem.cid.toString(), - if (epId?.isNotEmpty == true) 'epId': epId!, - }; - // if (seasonId != null) { - // parameters['seasonId'] = seasonId.toString(); - // } Utils.toViewPage( - '', - parameters: parameters, + 'bvid=$bvid&cid=${videoItem.cid}${epId?.isNotEmpty == true ? '&epId=$epId' : ''}', arguments: { 'videoItem': videoItem, 'heroTag': Utils.makeHeroTag(id), diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart index 87ad7b3c..4e550eb4 100644 --- a/lib/pages/subscription_detail/widget/sub_video_card.dart +++ b/lib/pages/subscription_detail/widget/sub_video_card.dart @@ -28,14 +28,8 @@ class SubVideoCardH extends StatelessWidget { return InkWell( onTap: () async { int cid = await SearchHttp.ab2c(bvid: bvid); - Map parameters = { - 'bvid': bvid, - 'cid': cid.toString(), - }; - Utils.toViewPage( - '', - parameters: parameters, + 'bvid=$bvid&cid=$cid', arguments: { 'videoItem': videoItem, 'heroTag': Utils.makeHeroTag(id), diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 17206731..a8e6aefe 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -1997,20 +1997,22 @@ class VideoDetailController extends GetxController plPlayerController.playerStatus.status.value != PlayerStatus.completed && playedTime != null) { - plPlayerController.makeHeartBeat( - data.timeLength != null - ? (data.timeLength! - playedTime!.inMilliseconds).abs() <= 1000 - ? -1 - : playedTime!.inSeconds - : playedTime!.inSeconds, - type: 'status', - isManual: true, - bvid: bvid, - cid: cid.value, - epid: videoType == SearchType.media_bangumi ? epId : null, - seasonId: videoType == SearchType.media_bangumi ? seasonId : null, - subType: videoType == SearchType.media_bangumi ? subType : null, - ); + try { + plPlayerController.makeHeartBeat( + data.timeLength != null + ? (data.timeLength! - playedTime!.inMilliseconds).abs() <= 1000 + ? -1 + : playedTime!.inSeconds + : playedTime!.inSeconds, + type: 'status', + isManual: true, + bvid: bvid, + cid: cid.value, + epid: videoType == SearchType.media_bangumi ? epId : null, + seasonId: videoType == SearchType.media_bangumi ? seasonId : null, + subType: videoType == SearchType.media_bangumi ? subType : null, + ); + } catch (_) {} } } diff --git a/lib/pages/video/detail/view_v.dart b/lib/pages/video/detail/view_v.dart index 398c8cc0..3aab1232 100644 --- a/lib/pages/video/detail/view_v.dart +++ b/lib/pages/video/detail/view_v.dart @@ -1631,9 +1631,10 @@ class _VideoDetailPageVState extends State onTap: handlePlay, child: Obx( () => CachedNetworkImage( - imageUrl: - (videoDetailController.videoItem['pic'] as String) - .http2https, + imageUrl: videoDetailController.videoItem['pic'] != null + ? (videoDetailController.videoItem['pic'] as String) + .http2https + : '', width: videoWidth, height: videoHeight, fit: BoxFit.cover,