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

Merge branch 'main' into feature-media_kit

Browse Source
This commit is contained in:
guozhigq
2023-08-20 15:48:51 +08:00
parent 50a5653516 7bb7159d48
commit 5f03244085
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/models/user/history.dart
View File

@ -121,7 +121,7 @@ class HisListItem {
viewAt = json['view_at'];
progress = json['progress'];
badge = json['badge'];
showTitle = json['show_title'];
showTitle = json['show_title'] == '' ? null : json['show_title'];
duration = json['duration'];
current = json['current'];
total = json['total'];

3
lib/pages/history/view.dart
View File

@ -102,8 +102,7 @@ class _HistoryPageState extends State<HistoryPage> {
Map data = snapshot.data;
if (data['status']) {
return Obx(
() => _historyController.historyList.isNotEmpty &&
!_historyController.isLoadingMore.value
() => _historyController.historyList.isNotEmpty
? SliverList(
delegate: SliverChildBuilderDelegate(
(context, index) {

31
lib/pages/history/widgets/item.dart
View File

@ -37,20 +37,23 @@ class HistoryItem extends StatelessWidget {
'pageTitle': videoItem.title
},
);
} else if (videoItem.history.business == 'live' &&
videoItem.liveStatus == 1) {
LiveItemModel liveItem = LiveItemModel.fromJson({
'face': videoItem.authorFace,
'roomid': videoItem.history.oid,
'pic': videoItem.cover,
'title': videoItem.title,
'uname': videoItem.authorName,
'cover': videoItem.cover,
});
Get.toNamed(
'/liveRoom?roomid=${videoItem.history.oid}',
arguments: {'liveItem': liveItem},
);
} else if (videoItem.history.business == 'live') {
if (videoItem.liveStatus == 1) {
LiveItemModel liveItem = LiveItemModel.fromJson({
'face': videoItem.authorFace,
'roomid': videoItem.history.oid,
'pic': videoItem.cover,
'title': videoItem.title,
'uname': videoItem.authorName,
'cover': videoItem.cover,
});
Get.toNamed(
'/liveRoom?roomid=${videoItem.history.oid}',
arguments: {'liveItem': liveItem},
);
} else {
SmartDialog.showToast('直播未开播');
}
} else if (videoItem.badge == '番剧' ||
videoItem.tagName.contains('动画')) {
/// hack