Merge branch 'design'

This commit is contained in:
guozhigq
2023-11-27 00:43:53 +08:00
38 changed files with 1550 additions and 696 deletions

View File

@ -76,6 +76,7 @@ class VideoIntroController extends GetxController {
if (Get.arguments.containsKey('videoItem')) {
preRender = true;
var args = Get.arguments['videoItem'];
var keys = Get.arguments.keys.toList();
videoItem!['pic'] = args.pic;
if (args.title is String) {
videoItem!['title'] = args.title;
@ -86,11 +87,9 @@ class VideoIntroController extends GetxController {
}
videoItem!['title'] = str;
}
if (args.stat != null) {
videoItem!['stat'] = args.stat;
}
videoItem!['pubdate'] = args.pubdate;
videoItem!['owner'] = args.owner;
videoItem!['stat'] = keys.contains('stat') && args.stat;
videoItem!['pubdate'] = keys.contains('pubdate') && args.pubdate;
videoItem!['owner'] = keys.contains('owner') && args.owner;
}
}
userLogin = userInfo != null;

View File

@ -247,7 +247,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
padding: const EdgeInsets.only(
left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
sliver: SliverToBoxAdapter(
child: !loadingStatus || videoItem.isNotEmpty
child: !loadingStatus
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -277,7 +277,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
children: [
StatView(
theme: 'gray',
view: !widget.loadingStatus
view: !loadingStatus
? widget.videoDetail!.stat!.view
: videoItem['stat'].view,
size: 'medium',
@ -285,7 +285,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
const SizedBox(width: 10),
StatDanMu(
theme: 'gray',
danmu: !widget.loadingStatus
danmu: !loadingStatus
? widget.videoDetail!.stat!.danmaku
: videoItem['stat'].danmaku,
size: 'medium',
@ -293,7 +293,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
const SizedBox(width: 10),
Text(
Utils.dateFormat(
!widget.loadingStatus
!loadingStatus
? widget.videoDetail!.pubdate
: videoItem['pubdate'],
formatType: 'detail'),