HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: subscription

Browse Source 
opt: pages

Closes #58

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2024-12-28 10:15:09 +08:00
parent 51f87cc49c
commit de91bdff74
12 changed files with 448 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/http/user.dart
View File

@@ -374,24 +374,25 @@ class UserHttp {
} }
// 我的订阅 // 我的订阅
static Future userSubFolder({ static Future<LoadingState> userSubFolder({
required int mid, required int mid,
required int pn, required int pn,
required int ps, required int ps,
}) async { }) async {
var res = await Request().get(Api.userSubFolder, queryParameters: { var res = await Request().get(
'up_mid': mid, Api.userSubFolder,
'ps': ps, queryParameters: {
'pn': pn, 'up_mid': mid,
'platform': 'web', 'ps': ps,
}); 'pn': pn,
'platform': 'web',
},
);
if (res.data['code'] == 0 && res.data['data'] is Map) { if (res.data['code'] == 0 && res.data['data'] is Map) {
return { return LoadingState.success(
'status': true, SubFolderModelData.fromJson(res.data['data']).list);
'data': SubFolderModelData.fromJson(res.data['data'])
};
} else { } else {
return {'status': false, 'msg': res.data['message']}; return LoadingState.error(res.data['message']);
} }
} }

21
lib/pages/fav/view.dart
View File

@@ -82,18 +82,23 @@ class _FavPageState extends State<FavPage> {
Widget _buildBody(LoadingState loadingState) { Widget _buildBody(LoadingState loadingState) {
return switch (loadingState) { return switch (loadingState) {
Loading() => SliverGrid( Loading() => SliverPadding(
gridDelegate: SliverGridDelegateWithExtentAndRatio( padding:
const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
sliver: SliverGrid(
gridDelegate: SliverGridDelegateWithExtentAndRatio(
mainAxisSpacing: StyleString.cardSpace, mainAxisSpacing: StyleString.cardSpace,
crossAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace,
maxCrossAxisExtent: Grid.maxRowWidth * 2, maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4, childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0), mainAxisExtent: 0,
delegate: SliverChildBuilderDelegate( ),
(BuildContext context, int index) { delegate: SliverChildBuilderDelegate(
return const VideoCardHSkeleton(); (BuildContext context, int index) {
}, return const VideoCardHSkeleton();
childCount: 10, },
childCount: 10,
),
), ),
), ),
Success() => (loadingState.response as List?)?.isNotEmpty == true Success() => (loadingState.response as List?)?.isNotEmpty == true

34
lib/pages/fav_detail/view.dart
View File

@@ -289,19 +289,23 @@ class _FavDetailPageState extends State<FavDetailPage> {
Widget _buildBody(LoadingState loadingState) { Widget _buildBody(LoadingState loadingState) {
return switch (loadingState) { return switch (loadingState) {
Loading() => SliverGrid( Loading() => SliverPadding(
gridDelegate: SliverGridDelegateWithExtentAndRatio( padding:
mainAxisSpacing: StyleString.cardSpace, const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
crossAxisSpacing: StyleString.safeSpace, sliver: SliverGrid(
maxCrossAxisExtent: Grid.maxRowWidth * 2, gridDelegate: SliverGridDelegateWithExtentAndRatio(
childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisSpacing: StyleString.cardSpace,
mainAxisExtent: 0, crossAxisSpacing: StyleString.safeSpace,
), maxCrossAxisExtent: Grid.maxRowWidth * 2,
delegate: SliverChildBuilderDelegate( childAspectRatio: StyleString.aspectRatio * 2.4,
(context, index) { mainAxisExtent: 0,
return const VideoCardHSkeleton(); ),
}, delegate: SliverChildBuilderDelegate(
childCount: 10, (context, index) {
return const VideoCardHSkeleton();
},
childCount: 10,
),
), ),
), ),
Success() => (loadingState.response as List?)?.isNotEmpty == true Success() => (loadingState.response as List?)?.isNotEmpty == true
@@ -356,9 +360,9 @@ class _FavDetailPageState extends State<FavDetailPage> {
}, },
), ),
Positioned( Positioned(
top: 0, top: 8,
left: 12, left: 12,
bottom: 0, bottom: 8,
child: IgnorePointer( child: IgnorePointer(
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, constraints) => builder: (context, constraints) =>

114
lib/pages/fav_detail/widget/fav_video_card.dart
View File

@@ -74,65 +74,63 @@ class FavVideoCardH extends StatelessWidget {
}); });
}, },
onLongPress: onLongPress, onLongPress: onLongPress,
child: Column( child: Padding(
children: [ padding: const EdgeInsets.symmetric(
Padding( horizontal: StyleString.safeSpace,
padding: vertical: StyleString.cardSpace,
const EdgeInsets.symmetric(horizontal: StyleString.safeSpace), ),
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, boxConstraints) { builder: (context, boxConstraints) {
double width = double width =
(boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2; (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
return SizedBox( return SizedBox(
height: width / StyleString.aspectRatio, height: width / StyleString.aspectRatio,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AspectRatio( AspectRatio(
aspectRatio: StyleString.aspectRatio, aspectRatio: StyleString.aspectRatio,
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, boxConstraints) { builder: (context, boxConstraints) {
double maxWidth = boxConstraints.maxWidth; double maxWidth = boxConstraints.maxWidth;
double maxHeight = boxConstraints.maxHeight; double maxHeight = boxConstraints.maxHeight;
return Stack( return Stack(
children: [ children: [
Hero( Hero(
tag: heroTag, tag: heroTag,
child: NetworkImgLayer( child: NetworkImgLayer(
src: videoItem.pic, src: videoItem.pic,
width: maxWidth, width: maxWidth,
height: maxHeight, height: maxHeight,
), ),
), ),
PBadge( PBadge(
text: Utils.timeFormat(videoItem.duration!), text: Utils.timeFormat(videoItem.duration!),
right: 6.0, right: 6.0,
bottom: 6.0, bottom: 6.0,
type: 'gray', type: 'gray',
), ),
if (videoItem.ogv != null) ...[ if (videoItem.ogv != null) ...[
PBadge( PBadge(
text: videoItem.ogv['type_name'], text: videoItem.ogv['type_name'],
top: 6.0, top: 6.0,
right: 6.0, right: 6.0,
bottom: null, bottom: null,
left: null, left: null,
), ),
], ],
], ],
); );
}, },
), ),
),
videoContent(context)
],
), ),
); videoContent(context)
}, ],
), ),
), );
], },
),
), ),
); );
} }

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

@@ -148,19 +148,24 @@ class _HistoryPageState extends State<HistoryPage> {
Widget _buildBody(LoadingState loadingState) { Widget _buildBody(LoadingState loadingState) {
return switch (loadingState) { return switch (loadingState) {
Loading() => SliverGrid( Loading() => SliverPadding(
gridDelegate: SliverGridDelegateWithExtentAndRatio( padding: const EdgeInsets.symmetric(
mainAxisSpacing: StyleString.cardSpace, horizontal: StyleString.safeSpace,
crossAxisSpacing: StyleString.safeSpace,
maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0,
), ),
delegate: SliverChildBuilderDelegate( sliver: SliverGrid(
(context, index) { gridDelegate: SliverGridDelegateWithExtentAndRatio(
return const VideoCardHSkeleton(); mainAxisSpacing: StyleString.cardSpace,
}, crossAxisSpacing: StyleString.safeSpace,
childCount: 10, maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0,
),
delegate: SliverChildBuilderDelegate(
(context, index) {
return const VideoCardHSkeleton();
},
childCount: 10,
),
), ),
), ),
Success() => (loadingState.response as List?)?.isNotEmpty == true Success() => (loadingState.response as List?)?.isNotEmpty == true

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

@@ -160,148 +160,143 @@ class HistoryItem extends StatelessWidget {
onChoose?.call(); onChoose?.call();
} }
}, },
child: Column( child: Padding(
children: [ padding: const EdgeInsets.symmetric(
Padding( horizontal: StyleString.safeSpace,
padding: const EdgeInsets.fromLTRB( vertical: StyleString.cardSpace,
StyleString.safeSpace, 0, StyleString.safeSpace, 0), ),
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, boxConstraints) { builder: (context, boxConstraints) {
double width = double width =
(boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2; (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
return SizedBox( return SizedBox(
height: width / StyleString.aspectRatio, height: width / StyleString.aspectRatio,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [
Stack(
children: [ children: [
Stack( AspectRatio(
children: [ aspectRatio: StyleString.aspectRatio,
AspectRatio( child: LayoutBuilder(
aspectRatio: StyleString.aspectRatio, builder: (context, boxConstraints) {
child: LayoutBuilder( double maxWidth = boxConstraints.maxWidth;
builder: (context, boxConstraints) { double maxHeight = boxConstraints.maxHeight;
double maxWidth = boxConstraints.maxWidth; return Stack(
double maxHeight = boxConstraints.maxHeight; children: [
return Stack( Hero(
children: [ tag: heroTag,
Hero( child: NetworkImgLayer(
tag: heroTag, radius: 12,
child: NetworkImgLayer( src: (videoItem.cover != ''
radius: 12, ? videoItem.cover
src: (videoItem.cover != '' : videoItem.covers.first),
? videoItem.cover width: maxWidth,
: videoItem.covers.first), height: maxHeight,
width: maxWidth,
height: maxHeight,
),
),
if (!BusinessType
.hiddenDurationType.hiddenDurationType
.contains(videoItem.history.business))
PBadge(
text: videoItem.progress == -1
? '已看完'
: '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
right: 6.0,
bottom: 8.0,
type: 'gray',
),
// 右上角
if (BusinessType.showBadge.showBadge
.contains(
videoItem.history.business) ||
videoItem.history.business ==
BusinessType.live.type)
PBadge(
text: videoItem.badge,
top: 6.0,
right: 6.0,
bottom: null,
left: null,
),
],
);
},
),
),
Positioned.fill(
child: AnimatedOpacity(
opacity: videoItem.checked ? 1 : 0,
duration: const Duration(milliseconds: 200),
child: Container(
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Colors.black.withOpacity(0.6),
),
child: SizedBox(
width: 34,
height: 34,
child: AnimatedScale(
scale: videoItem.checked ? 1 : 0,
duration: const Duration(milliseconds: 250),
curve: Curves.easeInOut,
child: IconButton(
tooltip: '取消选择',
style: ButtonStyle(
padding: WidgetStateProperty.all(
EdgeInsets.zero),
backgroundColor:
WidgetStateProperty.resolveWith(
(states) {
return Theme.of(context)
.colorScheme
.surface
.withOpacity(0.8);
},
),
),
onPressed: () {
feedBack();
onChoose?.call();
},
icon: Icon(Icons.done_all_outlined,
color: Theme.of(context)
.colorScheme
.primary),
),
), ),
), ),
if (!BusinessType
.hiddenDurationType.hiddenDurationType
.contains(videoItem.history.business))
PBadge(
text: videoItem.progress == -1
? '已看完'
: '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
right: 6.0,
bottom: 8.0,
type: 'gray',
),
// 右上角
if (BusinessType.showBadge.showBadge
.contains(videoItem.history.business) ||
videoItem.history.business ==
BusinessType.live.type)
PBadge(
text: videoItem.badge,
top: 6.0,
right: 6.0,
bottom: null,
left: null,
),
],
);
},
),
),
Positioned.fill(
child: AnimatedOpacity(
opacity: videoItem.checked ? 1 : 0,
duration: const Duration(milliseconds: 200),
child: Container(
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Colors.black.withOpacity(0.6),
),
child: SizedBox(
width: 34,
height: 34,
child: AnimatedScale(
scale: videoItem.checked ? 1 : 0,
duration: const Duration(milliseconds: 250),
curve: Curves.easeInOut,
child: IconButton(
tooltip: '取消选择',
style: ButtonStyle(
padding: WidgetStateProperty.all(
EdgeInsets.zero),
backgroundColor:
WidgetStateProperty.resolveWith(
(states) {
return Theme.of(context)
.colorScheme
.surface
.withOpacity(0.8);
},
),
),
onPressed: () {
feedBack();
onChoose?.call();
},
icon: Icon(Icons.done_all_outlined,
color: Theme.of(context)
.colorScheme
.primary),
),
), ),
), ),
), ),
if (videoItem.duration != null && ),
videoItem.duration != 0 &&
videoItem.progress != 0)
Positioned(
left: 3,
right: 3,
bottom: 0,
child: ClipRRect(
borderRadius: BorderRadius.only(
bottomLeft:
Radius.circular(StyleString.imgRadius.x),
bottomRight:
Radius.circular(StyleString.imgRadius.x),
),
child: LinearProgressIndicator(
value: videoItem.progress == -1
? 100
: videoItem.progress / videoItem.duration,
),
),
)
],
), ),
videoContent(context) if (videoItem.duration != null &&
videoItem.duration != 0 &&
videoItem.progress != 0)
Positioned(
left: 4,
right: 4,
bottom: 0,
child: ClipRRect(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(12),
bottomRight: Radius.circular(12),
),
child: LinearProgressIndicator(
value: videoItem.progress == -1
? 100
: videoItem.progress / videoItem.duration,
),
),
)
], ],
), ),
); videoContent(context)
}, ],
), ),
), );
], },
),
), ),
); );
} }

2
lib/pages/later/view.dart
View File

@@ -112,7 +112,7 @@ class _LaterPageState extends State<LaterPage> {
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: StyleString.safeSpace, left: StyleString.safeSpace,
right: StyleString.safeSpace, right: StyleString.safeSpace,
bottom: MediaQuery.of(context).padding.bottom + 81, bottom: MediaQuery.of(context).padding.bottom + 85,
), ),
sliver: Obx( sliver: Obx(
() => _buildBody(_laterController.loadingState.value), () => _buildBody(_laterController.loadingState.value),

64
lib/pages/subscription/controller.dart
View File

@@ -1,48 +1,30 @@
import 'package:PiliPalaX/http/loading_state.dart';
import 'package:PiliPalaX/pages/common/common_controller.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:PiliPalaX/http/user.dart'; import 'package:PiliPalaX/http/user.dart';
import 'package:PiliPalaX/models/user/info.dart';
import 'package:PiliPalaX/utils/storage.dart'; import 'package:PiliPalaX/utils/storage.dart';
import '../../models/user/sub_folder.dart'; import '../../models/user/sub_folder.dart';
class SubController extends GetxController { class SubController extends CommonController {
final ScrollController scrollController = ScrollController(); dynamic mid;
Rx<SubFolderModelData> subFolderData = SubFolderModelData().obs;
UserInfoData? userInfo;
int currentPage = 1;
int pageSize = 20;
RxBool hasMore = true.obs;
Future<dynamic> querySubFolder({type = 'init'}) async { @override
userInfo = GStorage.userInfo.get('userInfoCache'); void onInit() {
if (userInfo == null) { super.onInit();
return {'status': false, 'msg': '账号未登录'}; mid = GStorage.userInfo.get('userInfoCache')?.mid;
} queryData();
var res = await UserHttp.userSubFolder(
pn: currentPage,
ps: pageSize,
mid: userInfo!.mid!,
);
if (res['status']) {
if (type == 'init') {
subFolderData.value = res['data'];
} else {
if (res['data'].list.isNotEmpty) {
subFolderData.value.list!.addAll(res['data'].list);
subFolderData.update((val) {});
}
}
currentPage++;
} else {
SmartDialog.showToast(res['msg']);
}
return res;
} }
Future onLoad() async { @override
querySubFolder(type: 'onload'); Future queryData([bool isRefresh = true]) {
if (mid == null) {
loadingState.value = LoadingState.error('账号未登录');
return Future.value();
}
return super.queryData(isRefresh);
} }
// 取消订阅 // 取消订阅
@@ -67,8 +49,9 @@ class SubController extends GetxController {
var res = await UserHttp.cancelSub( var res = await UserHttp.cancelSub(
id: subFolderItem.id!, type: subFolderItem.type!); id: subFolderItem.id!, type: subFolderItem.type!);
if (res['status']) { if (res['status']) {
subFolderData.value.list!.remove(subFolderItem); List list = (loadingState.value as Success).response;
subFolderData.update((val) {}); list.remove(subFolderItem);
loadingState.value = LoadingState.success(list);
SmartDialog.showToast('取消订阅成功'); SmartDialog.showToast('取消订阅成功');
} else { } else {
SmartDialog.showToast(res['msg']); SmartDialog.showToast(res['msg']);
@@ -83,8 +66,9 @@ class SubController extends GetxController {
} }
@override @override
void onClose() { Future<LoadingState> customGetData() => UserHttp.userSubFolder(
scrollController.dispose(); pn: currentPage,
super.onClose(); ps: 20,
} mid: mid,
);
} }

139
lib/pages/subscription/view.dart
View File

@@ -1,11 +1,12 @@
import 'package:easy_debounce/easy_throttle.dart'; import 'package:PiliPalaX/common/constants.dart';
import 'package:PiliPalaX/common/skeleton/video_card_h.dart';
import 'package:PiliPalaX/http/loading_state.dart';
import 'package:PiliPalaX/pages/subscription/widgets/item.dart';
import 'package:PiliPalaX/utils/grid.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:PiliPalaX/common/widgets/http_error.dart'; import 'package:PiliPalaX/common/widgets/http_error.dart';
import '../../common/constants.dart';
import '../../utils/grid.dart';
import 'controller.dart'; import 'controller.dart';
import 'widgets/item.dart';
class SubPage extends StatefulWidget { class SubPage extends StatefulWidget {
const SubPage({super.key}); const SubPage({super.key});
@@ -16,81 +17,73 @@ class SubPage extends StatefulWidget {
class _SubPageState extends State<SubPage> { class _SubPageState extends State<SubPage> {
final SubController _subController = Get.put(SubController()); final SubController _subController = Get.put(SubController());
late Future _futureBuilderFuture;
@override
void dispose() {
_subController.scrollController.removeListener(() {});
super.dispose();
}
@override
void initState() {
super.initState();
_futureBuilderFuture = _subController.querySubFolder();
_subController.scrollController.addListener(
() {
if (_subController.scrollController.position.pixels >=
_subController.scrollController.position.maxScrollExtent - 300) {
EasyThrottle.throttle('history', const Duration(seconds: 1), () {
_subController.onLoad();
});
}
},
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar(title: Text('我的订阅')), appBar: AppBar(title: Text('我的订阅')),
body: FutureBuilder( body: CustomScrollView(
future: _futureBuilderFuture, slivers: [
builder: (context, snapshot) { Obx(() => _buildBody(_subController.loadingState.value)),
if (snapshot.connectionState == ConnectionState.done) { SliverToBoxAdapter(
// TODO: refactor child: SizedBox(
Map? data = snapshot.data; height: MediaQuery.of(context).padding.bottom + 10,
if (data != null && data['status']) { ),
return Obx(() => CustomScrollView( ),
controller: _subController.scrollController, ],
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
SliverGrid(
gridDelegate: SliverGridDelegateWithExtentAndRatio(
mainAxisSpacing: StyleString.cardSpace,
crossAxisSpacing: StyleString.safeSpace,
maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0),
delegate: SliverChildBuilderDelegate(
childCount:
_subController.subFolderData.value.list!.length,
(BuildContext context, int index) {
return SubItem(
subFolderItem: _subController
.subFolderData.value.list![index],
cancelSub: _subController.cancelSub);
},
),
)
]));
} else {
return CustomScrollView(
physics: const NeverScrollableScrollPhysics(),
slivers: [
HttpError(
errMsg: data?['msg'],
callback: () => setState(() {}),
),
],
);
}
} else {
// 骨架屏
return const Text('请求中');
}
},
), ),
); );
} }
Widget _buildBody(LoadingState loadingState) {
return switch (loadingState) {
Loading() => SliverPadding(
padding:
const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
sliver: SliverGrid(
gridDelegate: SliverGridDelegateWithExtentAndRatio(
mainAxisSpacing: StyleString.cardSpace,
crossAxisSpacing: StyleString.safeSpace,
maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0,
),
delegate: SliverChildBuilderDelegate(
(context, index) => const VideoCardHSkeleton(),
childCount: 10,
),
),
),
Success() => (loadingState.response as List?)?.isNotEmpty == true
? SliverGrid(
gridDelegate: SliverGridDelegateWithExtentAndRatio(
mainAxisSpacing: StyleString.cardSpace,
crossAxisSpacing: StyleString.safeSpace,
maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0,
),
delegate: SliverChildBuilderDelegate(
childCount: loadingState.response.length,
(BuildContext context, int index) {
if (index == loadingState.response.length - 1) {
_subController.onLoadMore();
}
return SubItem(
subFolderItem: loadingState.response[index],
cancelSub: _subController.cancelSub,
);
},
),
)
: HttpError(
callback: _subController.onReload,
),
Error() => HttpError(
errMsg: loadingState.errMsg,
callback: _subController.onReload,
),
LoadingState() => throw UnimplementedError(),
};
}
} }

46
lib/pages/subscription_detail/view.dart
View File

@@ -1,5 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:PiliPalaX/common/constants.dart';
import 'package:PiliPalaX/utils/grid.dart';
import 'package:easy_debounce/easy_throttle.dart'; import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@@ -225,13 +227,23 @@ class _SubDetailPageState extends State<SubDetailPage> {
return Obx( return Obx(
() => subList.isEmpty () => subList.isEmpty
? const SliverToBoxAdapter(child: SizedBox()) ? const SliverToBoxAdapter(child: SizedBox())
: SliverList( : SliverGrid(
delegate: gridDelegate:
SliverChildBuilderDelegate((context, index) { SliverGridDelegateWithExtentAndRatio(
return SubVideoCardH( mainAxisSpacing: StyleString.cardSpace,
videoItem: subList[index], crossAxisSpacing: StyleString.safeSpace,
); maxCrossAxisExtent: Grid.maxRowWidth * 2,
}, childCount: subList.length), childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0,
),
delegate: SliverChildBuilderDelegate(
childCount: subList.length,
(BuildContext context, int index) {
return SubVideoCardH(
videoItem: subList[index],
);
},
),
), ),
); );
} }
@@ -246,10 +258,22 @@ class _SubDetailPageState extends State<SubDetailPage> {
} }
} else { } else {
// 骨架屏 // 骨架屏
return SliverList( return SliverPadding(
delegate: SliverChildBuilderDelegate((context, index) { padding: const EdgeInsets.symmetric(
return const VideoCardHSkeleton(); horizontal: StyleString.safeSpace),
}, childCount: 10), sliver: SliverGrid(
gridDelegate: SliverGridDelegateWithExtentAndRatio(
mainAxisSpacing: StyleString.cardSpace,
crossAxisSpacing: StyleString.safeSpace,
maxCrossAxisExtent: Grid.maxRowWidth * 2,
childAspectRatio: StyleString.aspectRatio * 2.4,
mainAxisExtent: 0,
),
delegate: SliverChildBuilderDelegate(
(context, index) => const VideoCardHSkeleton(),
childCount: 10,
),
),
); );
} }
}, },

112
lib/pages/subscription_detail/widget/sub_video_card.dart
View File

@@ -40,65 +40,61 @@ class SubVideoCardH extends StatelessWidget {
'videoType': SearchType.video, 'videoType': SearchType.video,
}); });
}, },
child: Column( child: Padding(
children: [ padding: const EdgeInsets.fromLTRB(
Padding( StyleString.safeSpace, 5, StyleString.safeSpace, 5),
padding: const EdgeInsets.fromLTRB( child: LayoutBuilder(
StyleString.safeSpace, 5, StyleString.safeSpace, 5), builder: (context, boxConstraints) {
child: LayoutBuilder( double width =
builder: (context, boxConstraints) { (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
double width = return SizedBox(
(boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2; height: width / StyleString.aspectRatio,
return SizedBox( child: Row(
height: width / StyleString.aspectRatio, mainAxisAlignment: MainAxisAlignment.start,
child: Row( crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, children: [
crossAxisAlignment: CrossAxisAlignment.start, AspectRatio(
children: [ aspectRatio: StyleString.aspectRatio,
AspectRatio( child: LayoutBuilder(
aspectRatio: StyleString.aspectRatio, builder: (context, boxConstraints) {
child: LayoutBuilder( double maxWidth = boxConstraints.maxWidth;
builder: (context, boxConstraints) { double maxHeight = boxConstraints.maxHeight;
double maxWidth = boxConstraints.maxWidth; return Stack(
double maxHeight = boxConstraints.maxHeight; children: [
return Stack( Hero(
children: [ tag: heroTag,
Hero( child: NetworkImgLayer(
tag: heroTag, src: videoItem.cover,
child: NetworkImgLayer( width: maxWidth,
src: videoItem.cover, height: maxHeight,
width: maxWidth, ),
height: maxHeight, ),
), PBadge(
), text: Utils.timeFormat(videoItem.duration!),
PBadge( right: 6.0,
text: Utils.timeFormat(videoItem.duration!), bottom: 6.0,
right: 6.0, type: 'gray',
bottom: 6.0, ),
type: 'gray', // if (videoItem.ogv != null) ...[
), // PBadge(
// if (videoItem.ogv != null) ...[ // text: videoItem.ogv['type_name'],
// PBadge( // top: 6.0,
// text: videoItem.ogv['type_name'], // right: 6.0,
// top: 6.0, // bottom: null,
// right: 6.0, // left: null,
// bottom: null, // ),
// left: null, // ],
// ), ],
// ], );
], },
); ),
},
),
),
videoContent(context)
],
), ),
); videoContent(context)
}, ],
), ),
), );
], },
),
), ),
); );
} }

44
pubspec.lock
View File

@@ -5,23 +5,23 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: _fe_analyzer_shared name: _fe_analyzer_shared
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "76.0.0" version: "72.0.0"
_macros: _macros:
dependency: transitive dependency: transitive
description: dart description: dart
source: sdk source: sdk
version: "0.3.3" version: "0.3.2"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
name: analyzer name: analyzer
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.11.0" version: "6.7.0"
animations: animations:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -317,10 +317,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.19.0" version: "1.18.0"
connectivity_plus: connectivity_plus:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -1042,18 +1042,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.7" version: "10.0.5"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.8" version: "3.0.5"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
@@ -1098,10 +1098,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: macros name: macros
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.1.3-main.0" version: "0.1.2-main.4"
mailer: mailer:
dependency: transitive dependency: transitive
description: description:
@@ -1659,7 +1659,7 @@ packages:
dependency: transitive dependency: transitive
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.99"
source_gen: source_gen:
dependency: transitive dependency: transitive
description: description:
@@ -1736,10 +1736,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.12.0" version: "1.11.1"
status_bar_control: status_bar_control:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -1768,10 +1768,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.2.0"
synchronized: synchronized:
dependency: transitive dependency: transitive
description: description:
@@ -1800,10 +1800,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.3" version: "0.7.2"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@@ -1960,10 +1960,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.3.0" version: "14.2.5"
volume_controller: volume_controller:
dependency: transitive dependency: transitive
description: description: