From fedb67c809da7c3c7169c92ca1d166951ea9a7f2 Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Fri, 27 Dec 2024 15:10:44 +0800 Subject: [PATCH] fix: media list desc Signed-off-by: bggRGjQaUbCoE --- lib/http/user.dart | 3 ++- .../content/video/member_video_ctr.dart | 11 +++++++---- lib/pages/video/detail/controller.dart | 11 ++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/http/user.dart b/lib/http/user.dart index 06226cb6..93b693c2 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -517,6 +517,7 @@ class UserHttp { int? otype, bool withCurrent = false, bool desc = true, + int sortField = 1, }) async { var res = await Request().get( Api.mediaList, @@ -529,7 +530,7 @@ class UserHttp { 'ps': ps, 'direction': false, 'desc': desc, - 'sort_field': 1, + 'sort_field': sortField, 'tid': 0, 'with_current': withCurrent, }, diff --git a/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart b/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart index af18741c..c131748a 100644 --- a/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart +++ b/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart @@ -26,8 +26,8 @@ class MemberVideoCtr extends CommonController { int? seriesId; final int mid; String? aid; - RxString order = 'pubdate'.obs; - RxString sort = 'desc'.obs; + late RxString order = 'pubdate'.obs; + late RxString sort = 'desc'.obs; RxInt count = (-1).obs; int? next; EpisodicButton? episodicButton; @@ -74,8 +74,8 @@ class MemberVideoCtr extends CommonController { type: type, mid: mid, aid: type == ContributeType.video ? aid : null, - order: order.value, - sort: sort.value, + order: type == ContributeType.video ? order.value : null, + sort: type == ContributeType.video ? null : sort.value, pn: type == ContributeType.charging ? currentPage : null, next: next, seasonId: seasonId, @@ -118,6 +118,9 @@ class MemberVideoCtr extends CommonController { 'mediaType': RegExp(r'page_type=([\d]+)') .firstMatch('${episodicButton?.uri}') ?.group(1), + 'reverse': type == ContributeType.video + ? order.value == 'click' + : sort.value == 'asc', }, ); break; diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 6615daa2..aed82f2a 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -333,13 +333,22 @@ class VideoDetailController extends GetxController mediaList.length >= Get.arguments['count']) { return; } + bool desc = + _mediaType == 2 || Get.arguments['mediaType'] == '8' ? false : true; var res = await UserHttp.getMediaList( type: Get.arguments['mediaType'] ?? _mediaType, bizId: Get.arguments['mediaId'] ?? -1, ps: 20, oid: mediaList.isEmpty ? null : mediaList.last.id, otype: mediaList.isEmpty ? null : mediaList.last.type, - desc: _mediaType == 2 || Get.arguments['mediaType'] == '8' ? false : true, + desc: + Get.arguments['mediaType'] != null && Get.arguments['reverse'] == true + ? desc.not + : desc, + sortField: + Get.arguments['mediaType'] == null && Get.arguments['reverse'] == true + ? 2 + : 1, ); if (res['status']) { if (res['data'].isNotEmpty) {