Merge branch 'main' into fix-coverSave

This commit is contained in:
guozhigq
2024-05-01 20:03:10 +08:00
3 changed files with 11 additions and 7 deletions

View File

@ -25,6 +25,7 @@ class SubItem extends StatelessWidget {
parameters: { parameters: {
'heroTag': heroTag, 'heroTag': heroTag,
'seasonId': subFolderItem.id.toString(), 'seasonId': subFolderItem.id.toString(),
'type': subFolderItem.type.toString(),
}, },
), ),
child: Padding( child: Padding(

View File

@ -14,13 +14,16 @@ class SubDetailController extends GetxController {
RxList<SubDetailMediaItem> subList = <SubDetailMediaItem>[].obs; RxList<SubDetailMediaItem> subList = <SubDetailMediaItem>[].obs;
RxString loadingText = '加载中...'.obs; RxString loadingText = '加载中...'.obs;
int mediaCount = 0; int mediaCount = 0;
late int channelType;
@override @override
void onInit() { void onInit() {
item = Get.arguments; item = Get.arguments;
if (Get.parameters.keys.isNotEmpty) { final parameters = Get.parameters;
seasonId = int.parse(Get.parameters['seasonId']!); if (parameters.isNotEmpty) {
heroTag = Get.parameters['heroTag']!; seasonId = int.tryParse(parameters['seasonId'] ?? '') ?? 0;
heroTag = parameters['heroTag'] ?? '';
channelType = int.tryParse(parameters['type'] ?? '') ?? 0;
} }
super.onInit(); super.onInit();
} }
@ -31,7 +34,7 @@ class SubDetailController extends GetxController {
return; return;
} }
isLoadingMore = true; isLoadingMore = true;
var res = type == 21 var res = channelType == 21
? await UserHttp.userSeasonList( ? await UserHttp.userSeasonList(
seasonId: seasonId, seasonId: seasonId,
ps: 20, ps: 20,

View File

@ -198,8 +198,8 @@ class _SubDetailPageState extends State<SubDetailPage> {
future: _futureBuilderFuture, future: _futureBuilderFuture,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) { if (snapshot.connectionState == ConnectionState.done) {
Map data = snapshot.data; Map? data = snapshot.data;
if (data['status']) { if (data != null && data['status']) {
if (_subDetailController.item.mediaCount == 0) { if (_subDetailController.item.mediaCount == 0) {
return const NoData(); return const NoData();
} else { } else {
@ -219,7 +219,7 @@ class _SubDetailPageState extends State<SubDetailPage> {
} }
} else { } else {
return HttpError( return HttpError(
errMsg: data['msg'], errMsg: data?['msg'] ?? '请求异常',
fn: () => setState(() {}), fn: () => setState(() {}),
); );
} }