diff --git a/lib/http/search.dart b/lib/http/search.dart index d40b7f80..5e920754 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -76,7 +76,7 @@ class SearchHttp { queryParameters: params, ); if (res.data is! Map) { - return Error('没有相关数据'); + return const Error('没有相关数据'); } if (res.data['code'] == 0) { dynamic data; @@ -144,7 +144,7 @@ class SearchHttp { queryParameters: params, ); if (res.data is! Map) { - return Error('没有相关数据'); + return const Error('没有相关数据'); } if (res.data['code'] == 0) { try { diff --git a/lib/http/user.dart b/lib/http/user.dart index e689f825..f57d6ff9 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -241,7 +241,7 @@ class UserHttp { ); if (res.data['code'] == 0) { if (res.data['data']['count'] == 0) { - return Success({'count': 0}); + return const Success({'count': 0}); } List list = []; if (res.data['data']?['list'] != null) { diff --git a/lib/models/space/item.dart b/lib/models/space/item.dart index 737ae1d7..1c4f83cc 100644 --- a/lib/models/space/item.dart +++ b/lib/models/space/item.dart @@ -1,4 +1,3 @@ -import 'package:PiliPlus/models/space/filter.dart'; import 'package:json_annotation/json_annotation.dart'; part 'item.g.dart'; @@ -47,8 +46,6 @@ class SpaceItem { bool? state; String? bvid; int? videos; - // @JsonKey(name: 'three_point') - // List? threePoint; @JsonKey(name: 'first_cid') int? firstCid; @JsonKey(name: 'view_content') @@ -57,7 +54,6 @@ class SpaceItem { int? iconType; @JsonKey(name: 'publish_time_text') String? publishTimeText; - List? filter; SpaceItem({ this.title, @@ -89,12 +85,10 @@ class SpaceItem { this.state, this.bvid, this.videos, - // this.threePoint, this.firstCid, this.viewContent, this.iconType, this.publishTimeText, - this.filter, }); factory SpaceItem.fromJson(Map json) => _$ItemFromJson(json); diff --git a/lib/models/space/item.g.dart b/lib/models/space/item.g.dart index f0a5dfc9..34ec9e9c 100644 --- a/lib/models/space/item.g.dart +++ b/lib/models/space/item.g.dart @@ -36,16 +36,10 @@ SpaceItem _$ItemFromJson(Map json) => SpaceItem( state: json['state'] as bool?, bvid: json['bvid'] as String?, videos: (json['videos'] as num?)?.toInt(), - // threePoint: (json['three_point'] as List?) - // ?.map((e) => ThreePoint.fromJson(e as Map)) - // .toList(), firstCid: (json['first_cid'] as num?)?.toInt(), viewContent: json['view_content'] as String?, iconType: (json['icon_type'] as num?)?.toInt(), publishTimeText: json['publish_time_text'] as String?, - filter: (json['filter'] as List?) - ?.map((e) => SpaceTabFilter.fromJson(e)) - .toList(), ); Map _$ItemToJson(SpaceItem instance) => { @@ -78,7 +72,6 @@ Map _$ItemToJson(SpaceItem instance) => { 'state': instance.state, 'bvid': instance.bvid, 'videos': instance.videos, - // 'three_point': instance.threePoint, 'first_cid': instance.firstCid, 'view_content': instance.viewContent, 'icon_type': instance.iconType, diff --git a/lib/models/space/tab2.dart b/lib/models/space/tab2.dart index 37c772fc..e96d44b1 100644 --- a/lib/models/space/tab2.dart +++ b/lib/models/space/tab2.dart @@ -1,16 +1,15 @@ +import 'package:PiliPlus/models/space/tab_item.dart'; import 'package:json_annotation/json_annotation.dart'; -import 'package:PiliPlus/models/space/item.dart'; - part 'tab2.g.dart'; @JsonSerializable() class Tab2 { - String? title; - String? param; - List? items; + final String? title; + final String? param; + final List? items; - Tab2({this.title, this.param, this.items}); + const Tab2({this.title, this.param, this.items}); factory Tab2.fromJson(Map json) => _$Tab2FromJson(json); diff --git a/lib/models/space/tab2.g.dart b/lib/models/space/tab2.g.dart index c7b9b5e2..26a44a90 100644 --- a/lib/models/space/tab2.g.dart +++ b/lib/models/space/tab2.g.dart @@ -10,7 +10,7 @@ Tab2 _$Tab2FromJson(Map json) => Tab2( title: json['title'] as String?, param: json['param'] as String?, items: (json['items'] as List?) - ?.map((e) => SpaceItem.fromJson(e as Map)) + ?.map((e) => SpaceTabItem.fromJson(e as Map)) .toList(), ); diff --git a/lib/models/space/tab_item.dart b/lib/models/space/tab_item.dart new file mode 100644 index 00000000..3611f85e --- /dev/null +++ b/lib/models/space/tab_item.dart @@ -0,0 +1,27 @@ +import 'package:PiliPlus/models/space/filter.dart'; + +class SpaceTabItem { + final String? title; + final String? param; + final int? seriesId; + final int? seasonId; + final List? filter; + + const SpaceTabItem({ + this.title, + this.param, + this.seriesId, + this.seasonId, + this.filter, + }); + + factory SpaceTabItem.fromJson(Map json) => SpaceTabItem( + title: json['title'] as String?, + param: json['param'] as String?, + seriesId: (json['series_id'] as num?)?.toInt(), + seasonId: (json['season_id'] as num?)?.toInt(), + filter: (json['filter'] as List?) + ?.map((e) => SpaceTabFilter.fromJson(e)) + .toList(), + ); +} diff --git a/lib/pages/common/common_whisper_controller.dart b/lib/pages/common/common_whisper_controller.dart index 87ece77e..7c61cca6 100644 --- a/lib/pages/common/common_whisper_controller.dart +++ b/lib/pages/common/common_whisper_controller.dart @@ -63,7 +63,7 @@ abstract class CommonWhisperController Future onDeleteList() async { var res = await ImGrpc.deleteSessionList(pageType: sessionPageType); if (res.isSuccess) { - loadingState.value = Success(null); + loadingState.value = const Success(null); } else { res.toast(); } diff --git a/lib/pages/fav/video/controller.dart b/lib/pages/fav/video/controller.dart index 9170bb85..d929b67c 100644 --- a/lib/pages/fav/video/controller.dart +++ b/lib/pages/fav/video/controller.dart @@ -17,7 +17,7 @@ class FavController @override Future queryData([bool isRefresh = true]) { if (mid == 0) { - loadingState.value = Error('账号未登录'); + loadingState.value = const Error('账号未登录'); return Future.value(); } return super.queryData(isRefresh); diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index 37ddbd58..0478098b 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -90,7 +90,7 @@ class _HistoryPageState extends State _historyController.baseCtr .onClearHistory(context, () { _historyController.loadingState.value = - Success(null); + const Success(null); if (_historyController.tabController != null) { for (final item @@ -99,7 +99,7 @@ class _HistoryPageState extends State Get.find( tag: item.type) .loadingState - .value = Success(null); + .value = const Success(null); } catch (_) {} } } diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart index 98ee4f48..2e6992f1 100644 --- a/lib/pages/member/controller.dart +++ b/lib/pages/member/controller.dart @@ -5,8 +5,8 @@ import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/common/member/tab_type.dart'; import 'package:PiliPlus/models/space/data.dart'; -import 'package:PiliPlus/models/space/item.dart'; import 'package:PiliPlus/models/space/tab2.dart'; +import 'package:PiliPlus/models/space/tab_item.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -123,12 +123,12 @@ class MemberController extends CommonDataController @override bool handleError(String? errMsg) { - tab2 = [ + tab2 = const [ Tab2(title: '动态', param: 'dynamic'), Tab2( title: '投稿', param: 'contribute', - items: [SpaceItem(title: '视频', param: 'video')], + items: [SpaceTabItem(title: '视频', param: 'video')], ), Tab2(title: '收藏', param: 'favorite'), Tab2(title: '追番', param: 'bangumi'), diff --git a/lib/pages/member_contribute/controller.dart b/lib/pages/member_contribute/controller.dart index fbb36323..d9f93820 100644 --- a/lib/pages/member_contribute/controller.dart +++ b/lib/pages/member_contribute/controller.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/models/space/item.dart'; import 'package:PiliPlus/models/space/tab2.dart'; +import 'package:PiliPlus/models/space/tab_item.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; @@ -21,7 +21,7 @@ class MemberContributeCtr extends CommonDataController TabController? tabController; List? tabs; late final _ctr = Get.find(tag: heroTag); - List? items; + List? items; @override void onInit() { @@ -34,7 +34,7 @@ class MemberContributeCtr extends CommonDataController // show if exist if (_ctr.hasSeasonOrSeries == true) { items!.add( - SpaceItem( + const SpaceTabItem( param: 'ugcSeason', title: '全部合集/列表', ), diff --git a/lib/pages/member_home/view.dart b/lib/pages/member_home/view.dart index 1fa99889..e41128d5 100644 --- a/lib/pages/member_home/view.dart +++ b/lib/pages/member_home/view.dart @@ -5,7 +5,7 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_v_member_home.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space/data.dart'; -import 'package:PiliPlus/models/space/item.dart'; +import 'package:PiliPlus/models/space/tab_item.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_member_home.dart'; import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/pages/member_article/widget/item.dart'; @@ -257,7 +257,7 @@ class _MemberHomeState extends State _ctr.tab2!.indexWhere((item) => item.param == param); if (index != -1) { if (['video', 'article', 'audio'].contains(param1)) { - List items = _ctr.tab2! + List items = _ctr.tab2! .firstWhere((item) => item.param == param) .items!; int index1 = diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart index f1d88956..d3b8bff5 100644 --- a/lib/pages/subscription/controller.dart +++ b/lib/pages/subscription/controller.dart @@ -21,7 +21,7 @@ class SubController @override Future queryData([bool isRefresh = true]) { if (mid == 0) { - loadingState.value = Error('账号未登录'); + loadingState.value = const Error('账号未登录'); return Future.value(); } return super.queryData(isRefresh); diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart index 8c517ff4..5cb3dd41 100644 --- a/lib/pages/video/controller.dart +++ b/lib/pages/video/controller.dart @@ -1092,7 +1092,7 @@ class VideoDetailController extends GetxController subType: videoType == SearchType.media_bangumi ? subType : null, callback: () { if (videoState.value is! Success) { - videoState.value = Success(null); + videoState.value = const Success(null); } setSubtitle(vttSubtitlesIndex.value); }, @@ -1186,7 +1186,7 @@ class VideoDetailController extends GetxController SmartDialog.showToast('视频资源不存在'); autoPlay.value = false; isShowCover.value = true; - videoState.value = Error('视频资源不存在'); + videoState.value = const Error('视频资源不存在'); if (plPlayerController.isFullScreen.value) { plPlayerController.toggleFullScreen(false); }