Merge branch 'main' into fix-coverSave
This commit is contained in:
@ -25,6 +25,7 @@ class SubItem extends StatelessWidget {
|
||||
parameters: {
|
||||
'heroTag': heroTag,
|
||||
'seasonId': subFolderItem.id.toString(),
|
||||
'type': subFolderItem.type.toString(),
|
||||
},
|
||||
),
|
||||
child: Padding(
|
||||
|
@ -14,13 +14,16 @@ class SubDetailController extends GetxController {
|
||||
RxList<SubDetailMediaItem> subList = <SubDetailMediaItem>[].obs;
|
||||
RxString loadingText = '加载中...'.obs;
|
||||
int mediaCount = 0;
|
||||
late int channelType;
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
item = Get.arguments;
|
||||
if (Get.parameters.keys.isNotEmpty) {
|
||||
seasonId = int.parse(Get.parameters['seasonId']!);
|
||||
heroTag = Get.parameters['heroTag']!;
|
||||
final parameters = Get.parameters;
|
||||
if (parameters.isNotEmpty) {
|
||||
seasonId = int.tryParse(parameters['seasonId'] ?? '') ?? 0;
|
||||
heroTag = parameters['heroTag'] ?? '';
|
||||
channelType = int.tryParse(parameters['type'] ?? '') ?? 0;
|
||||
}
|
||||
super.onInit();
|
||||
}
|
||||
@ -31,7 +34,7 @@ class SubDetailController extends GetxController {
|
||||
return;
|
||||
}
|
||||
isLoadingMore = true;
|
||||
var res = type == 21
|
||||
var res = channelType == 21
|
||||
? await UserHttp.userSeasonList(
|
||||
seasonId: seasonId,
|
||||
ps: 20,
|
||||
|
@ -198,8 +198,8 @@ class _SubDetailPageState extends State<SubDetailPage> {
|
||||
future: _futureBuilderFuture,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.done) {
|
||||
Map data = snapshot.data;
|
||||
if (data['status']) {
|
||||
Map? data = snapshot.data;
|
||||
if (data != null && data['status']) {
|
||||
if (_subDetailController.item.mediaCount == 0) {
|
||||
return const NoData();
|
||||
} else {
|
||||
@ -219,7 +219,7 @@ class _SubDetailPageState extends State<SubDetailPage> {
|
||||
}
|
||||
} else {
|
||||
return HttpError(
|
||||
errMsg: data['msg'],
|
||||
errMsg: data?['msg'] ?? '请求异常',
|
||||
fn: () => setState(() {}),
|
||||
);
|
||||
}
|
||||
|
Reference in New Issue
Block a user