diff --git a/lib/http/user.dart b/lib/http/user.dart index ed43f3b7..a7d12604 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -296,9 +296,7 @@ class UserHttp { } // 移除已观看 - static Future toViewDel({ - List? aids, - }) async { + static Future toViewDel({List? aids}) async { final Map params = { 'jsonp': 'jsonp', 'csrf': await Request.getCsrf(), @@ -352,7 +350,7 @@ class UserHttp { } // 删除历史记录 - static Future delHistory(List kidList) async { + static Future delHistory(List kidList) async { var res = await Request().post( Api.delHistory, data: { diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index 932d92ac..a0b102a8 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -219,8 +219,8 @@ class BangumiIntroController return; } - List addMediaIdsNew = []; - List delMediaIdsNew = []; + List addMediaIdsNew = []; + List delMediaIdsNew = []; try { for (var i in favFolderData.value.list!.toList()) { bool isFaved = favIds?.contains(i.id) == true; diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index 065fe681..1314a3fa 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -167,8 +167,14 @@ class _BangumiPageState extends CommonPageState if (widget.tabType == TabType.bangumi) { Get.to(PgcIndexPage()); } else { - List titles = const ['全部', '电影', '电视剧', '纪录片', '综艺']; - List types = const [102, 2, 5, 3, 7]; + List titles = const [ + '全部', + '电影', + '电视剧', + '纪录片', + '综艺', + ]; + List types = const [102, 2, 5, 3, 7]; Get.to( Scaffold( appBar: AppBar(title: const Text('索引')), diff --git a/lib/pages/common/common_controller.dart b/lib/pages/common/common_controller.dart index fde1547d..6475431b 100644 --- a/lib/pages/common/common_controller.dart +++ b/lib/pages/common/common_controller.dart @@ -40,7 +40,7 @@ abstract class CommonController extends GetxController Future> customGetData(); - void handleListResponse(List dataList) {} + void handleListResponse(List dataList) {} bool customHandleResponse(bool isRefresh, Success response) { return false; diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index e7597660..60102f99 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -105,7 +105,8 @@ class FavDetailController TextButton( onPressed: () async { Get.back(); - List list = ((loadingState.value as Success).response as List) + List list = ((loadingState.value as Success) + .response as List) .where((e) => e.checked == true) .toList(); dynamic result = await VideoHttp.delFav( diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart index db3ab243..39cadd71 100644 --- a/lib/pages/history/controller.dart +++ b/lib/pages/history/controller.dart @@ -102,18 +102,17 @@ class HistoryController extends MultiSelectController } // 删除某条历史记录 - Future delHistory(kid, business) async { - _onDelete(((loadingState.value as Success).response as List) - .where((e) => e.kid == kid) - .toList()); + Future delHistory(HisListItem item) async { + _onDelete([item]); } // 删除已看历史记录 void onDelHistory() { if (loadingState.value is Success) { - List list = ((loadingState.value as Success).response as List) - .where((e) => e.progress == -1) - .toList(); + List list = + ((loadingState.value as Success).response as List) + .where((e) => e.progress == -1) + .toList(); if (list.isNotEmpty) { _onDelete(list); } else { @@ -122,10 +121,10 @@ class HistoryController extends MultiSelectController } } - void _onDelete(List result) async { + void _onDelete(List result) async { SmartDialog.showLoading(msg: '请求中'); - List kidList = result.map((item) { - return '${item.history?.business}_${item.kid}'; + List kidList = result.map((item) { + return '${item.history.business}_${item.kid}'; }).toList(); dynamic response = await UserHttp.delHistory(kidList); if (response['status']) { @@ -170,7 +169,8 @@ class HistoryController extends MultiSelectController onPressed: () async { Get.back(); if (loadingState.value is Success) { - _onDelete(((loadingState.value as Success).response as List) + _onDelete(((loadingState.value as Success).response + as List) .where((e) => e.checked == true) .toList()); } diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index 424534d9..b2fba93d 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -294,12 +294,13 @@ class _HistoryPageState extends State if (index == loadingState.response!.length - 1) { _historyController.onLoadMore(); } + final item = loadingState.response![index]; return HistoryItem( - videoItem: loadingState.response![index], + videoItem: item, ctr: _historyController.baseCtr, onChoose: () => _historyController.onSelect(index), onDelete: (kid, business) => - _historyController.delHistory(kid, business), + _historyController.delHistory(item), ); }, childCount: loadingState.response!.length, diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart index ccf3b6e1..9a0ec41a 100644 --- a/lib/pages/later/controller.dart +++ b/lib/pages/later/controller.dart @@ -120,7 +120,8 @@ class LaterController extends MultiSelectController { TextButton( onPressed: () async { Get.back(); - _onDelete(((loadingState.value as Success).response as List) + _onDelete(((loadingState.value as Success).response + as List) .where((e) => e.checked == true) .toList()); }, @@ -132,9 +133,9 @@ class LaterController extends MultiSelectController { ); } - void _onDelete(List result) async { + void _onDelete(List result) async { SmartDialog.showLoading(msg: '请求中'); - List aids = result.map((item) => item.aid).toList(); + List aids = result.map((item) => item.aid).toList(); dynamic res = await UserHttp.toViewDel(aids: aids); if (res['status']) { Set remainList = diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart index 00d4c80e..04c2c27c 100644 --- a/lib/pages/media/view.dart +++ b/lib/pages/media/view.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/pages/main/controller.dart'; +import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; @@ -176,9 +177,11 @@ class _MediaPageState extends CommonPageState Widget _buildBody(LoadingState loadingState) { if (loadingState is Success) { - List favFolderList = loadingState.response.list; - int favFolderCount = loadingState.response.count; - bool flag = favFolderCount > favFolderList.length; + List? favFolderList = loadingState.response.list; + if (favFolderList.isNullOrEmpty) { + return const SizedBox.shrink(); + } + bool flag = controller.count.value > favFolderList!.length; return ListView.builder( itemCount: loadingState.response.list.length + (flag ? 1 : 0), itemBuilder: (context, index) { diff --git a/lib/pages/member_seasons/view.dart b/lib/pages/member_seasons/view.dart index 9b0407ee..dde4d890 100644 --- a/lib/pages/member_seasons/view.dart +++ b/lib/pages/member_seasons/view.dart @@ -1,4 +1,5 @@ import 'package:PiliPlus/common/widgets/http_error.dart'; +import 'package:PiliPlus/models/member/seasons.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -71,7 +72,8 @@ class _MemberSeasonsPageState extends State { ); } Map data = snapshot.data as Map; - List list = _memberSeasonsController.seasonsList; + List list = + _memberSeasonsController.seasonsList; if (data['status']) { return Obx( () => list.isNotEmpty diff --git a/lib/pages/msg_feed_top/sys_msg/controller.dart b/lib/pages/msg_feed_top/sys_msg/controller.dart index 1b23651c..94a75b22 100644 --- a/lib/pages/msg_feed_top/sys_msg/controller.dart +++ b/lib/pages/msg_feed_top/sys_msg/controller.dart @@ -17,11 +17,11 @@ class SysMsgController } @override - void handleListResponse(List dataList) { + void handleListResponse(List dataList) { if (cursor == -1) { - msgSysUpdateCursor(dataList.first?.cursor); + msgSysUpdateCursor(dataList.first.cursor); } - cursor = dataList.last?.cursor ?? -1; + cursor = dataList.last.cursor ?? -1; if (isEnd.not && dataList.length + 1 < pageSize) { isEnd = true; } diff --git a/lib/pages/setting/pages/play_speed_set.dart b/lib/pages/setting/pages/play_speed_set.dart index 13643710..53cccfa4 100644 --- a/lib/pages/setting/pages/play_speed_set.dart +++ b/lib/pages/setting/pages/play_speed_set.dart @@ -18,7 +18,7 @@ class PlaySpeedPage extends StatefulWidget { class _PlaySpeedPageState extends State { late double playSpeedDefault; late double longPressSpeedDefault; - late List speedList; + late List speedList; late bool enableAutoLongPressSpeed; List> sheetMenu = [ { @@ -115,7 +115,7 @@ class _PlaySpeedPageState extends State { SmartDialog.showToast('该倍速已存在'); } else { Get.back(); - speedList.add(customSpeed); + speedList.add(customSpeed!); speedList.sort(); await video.put(VideoBoxKey.speedsList, speedList); setState(() {}); diff --git a/lib/pages/setting/widgets/model.dart b/lib/pages/setting/widgets/model.dart index f45317ea..1ed8fbf4 100644 --- a/lib/pages/setting/widgets/model.dart +++ b/lib/pages/setting/widgets/model.dart @@ -597,7 +597,7 @@ List get styleSettings => [ leading: const Icon(Icons.chrome_reader_mode_outlined), onTap: (setState) { final numberRegExp = RegExp(r'[\d\.]+'); - List springDescription = + List springDescription = GStorage.springDescription.map((i) => i.toString()).toList(); showDialog( context: Get.context!, diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart index 02e2dda7..69536ab9 100644 --- a/lib/pages/subscription_detail/view.dart +++ b/lib/pages/subscription_detail/view.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/models/user/sub_detail.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; @@ -215,7 +216,8 @@ class _SubDetailPageState extends State { }), ); } else { - List subList = _subDetailController.subList; + List subList = + _subDetailController.subList; return Obx( () => subList.isEmpty ? const SliverToBoxAdapter(child: SizedBox()) diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 285f7552..e55b5348 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -398,8 +398,8 @@ class VideoIntroController extends GetxController return; } - List addMediaIdsNew = []; - List delMediaIdsNew = []; + List addMediaIdsNew = []; + List delMediaIdsNew = []; try { for (var i in favFolderData.value.list!.toList()) { bool isFaved = favIds?.contains(i.id) == true; diff --git a/lib/pages/video/detail/introduction/pay_coins_page.dart b/lib/pages/video/detail/introduction/pay_coins_page.dart index 697984d5..f51fb46e 100644 --- a/lib/pages/video/detail/introduction/pay_coins_page.dart +++ b/lib/pages/video/detail/introduction/pay_coins_page.dart @@ -113,7 +113,7 @@ class _PayCoinsPageState extends State late AnimationController _coinFadeController; late AnimationController _boxAnimController; - final List _images = [ + final List _images = [ 'assets/images/paycoins/ic_thunder_1.png', 'assets/images/paycoins/ic_thunder_2.png', 'assets/images/paycoins/ic_thunder_3.png', diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart index 07f5c05f..f847d3dc 100644 --- a/lib/pages/video/detail/reply_reply/view.dart +++ b/lib/pages/video/detail/reply_reply/view.dart @@ -352,10 +352,11 @@ class _VideoReplyReplyPanelState if (res != null) { _savedReplies[key] = null; ReplyInfo replyInfo = Utils.replyCast(res); - List list = _videoReplyReplyController.loadingState.value is Success - ? (_videoReplyReplyController.loadingState.value as Success) - .response - : []; + List list = + _videoReplyReplyController.loadingState.value is Success + ? (_videoReplyReplyController.loadingState.value as Success) + .response + : []; list.insert(index + 1, replyInfo); _videoReplyReplyController.count.value += 1; _videoReplyReplyController.loadingState.refresh(); diff --git a/lib/pages/whisper/controller.dart b/lib/pages/whisper/controller.dart index 8ef37189..45548049 100644 --- a/lib/pages/whisper/controller.dart +++ b/lib/pages/whisper/controller.dart @@ -137,13 +137,12 @@ class WhisperController extends GetxController { return res; } - Future queryAccountList(sessionList) async { - List midsList = sessionList.map((e) => e.talkerId!).toList(); + Future queryAccountList(List sessionList) async { + List midsList = sessionList.map((e) => e.talkerId).toList(); var res = await MsgHttp.accountList(midsList.join(',')); if (res['status']) { accountList.value = res['data']; } - return res; } Future onLoad() async {