mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature-m3Design

Browse Source
This commit is contained in:
guozhigq
2023-07-17 11:03:53 +08:00
parent 2097b498fb 31beb59853
commit c140d55200
11 changed files with 144 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/common/widgets/video_card_v.dart
View File

@ -4,6 +4,7 @@ import 'package:pilipala/common/constants.dart';
import 'package:pilipala/common/widgets/stat/danmu.dart';
import 'package:pilipala/common/widgets/stat/view.dart';
import 'package:pilipala/pages/rcmd/index.dart';
import 'package:pilipala/utils/id_utils.dart';
import 'package:pilipala/utils/utils.dart';
import 'package:pilipala/pages/home/controller.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
@ -45,8 +46,8 @@ class VideoCardV extends StatelessWidget {
child: InkWell(
onTap: () async {
await Future.delayed(const Duration(milliseconds: 200));
print(videoItem.bvid);
Get.toNamed('/video?bvid=${videoItem.bvid}&cid=${videoItem.cid}',
String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid);
Get.toNamed('/video?bvid=$bvid&cid=${videoItem.cid}',
arguments: {'videoItem': videoItem, 'heroTag': heroTag});
},
child: Column(
@ -79,20 +80,22 @@ class VideoCardV extends StatelessWidget {
height: maxHeight,
),
),
Positioned(
left: 0,
right: 0,
bottom: 0,
child: AnimatedOpacity(
opacity: 1,
duration: const Duration(milliseconds: 200),
child: VideoStat(
view: videoItem.stat.view,
danmaku: videoItem.stat.danmaku,
duration: videoItem.duration,
if (videoItem.stat.view is int &&
videoItem.stat.danmaku is int)
Positioned(
left: 0,
right: 0,
bottom: 0,
child: AnimatedOpacity(
opacity: 1,
duration: const Duration(milliseconds: 200),
child: VideoStat(
view: videoItem.stat.view,
danmaku: videoItem.stat.danmaku,
duration: videoItem.duration,
),
),
),
),
],
);
}),
@ -137,7 +140,8 @@ class VideoContent extends StatelessWidget {
height: 18,
child: Row(
children: [
if (videoItem.rcmdReason.content != '') ...[
if (videoItem.rcmdReason != null &&
videoItem.rcmdReason.content != '') ...[
Container(
padding: const EdgeInsets.fromLTRB(3, 1, 3, 1),
decoration: BoxDecoration(