diff --git a/lib/http/api.dart b/lib/http/api.dart index fb69806d..0952fa0b 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -223,7 +223,7 @@ class Api { '${HttpString.tUrl}/dynamic_like/v1/dynamic_like/thumb'; // 获取稍后再看 - static const String seeYouLater = '/x/v2/history/toview'; + static const String seeYouLater = '/x/v2/history/toview/web'; // 获取历史记录 static const String historyList = '/x/web-interface/history/cursor'; @@ -381,7 +381,7 @@ class Api { static const String toViewLater = '/x/v2/history/toview/add'; // 移除已观看 - static const String toViewDel = '/x/v2/history/toview/del'; + static const String toViewDel = '/x/v2/history/toview/v2/dels'; // 清空稍后再看 static const String toViewClear = '/x/v2/history/toview/clear'; diff --git a/lib/http/danmaku.dart b/lib/http/danmaku.dart index cb25b615..00b59943 100644 --- a/lib/http/danmaku.dart +++ b/lib/http/danmaku.dart @@ -97,7 +97,6 @@ class DanmakuHttp { if (response.statusCode != 200) { return { 'status': false, - 'data': [], 'msg': '弹幕发送失败,状态码:${response.statusCode}', }; } @@ -109,7 +108,6 @@ class DanmakuHttp { } else { return { 'status': false, - 'data': [], 'msg': "${response.data['code']}: ${response.data['message']}", }; } diff --git a/lib/http/danmaku_block.dart b/lib/http/danmaku_block.dart index f7f36e0b..c638c835 100644 --- a/lib/http/danmaku_block.dart +++ b/lib/http/danmaku_block.dart @@ -12,7 +12,6 @@ class DanmakuFilterHttp { } else { return { 'status': false, - 'data': [], 'msg': res.data['message'], }; } diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart index 4d4f758c..c7825a7e 100644 --- a/lib/http/dynamics.dart +++ b/lib/http/dynamics.dart @@ -53,11 +53,7 @@ class DynamicsHttp { 'data': FollowUpModel.fromJson(res.data['data']), }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -80,11 +76,7 @@ class DynamicsHttp { 'data': res.data['data'], }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } diff --git a/lib/http/follow.dart b/lib/http/follow.dart index 11c597d3..2394ef47 100644 --- a/lib/http/follow.dart +++ b/lib/http/follow.dart @@ -17,11 +17,7 @@ class FollowHttp { 'data': FollowDataModel.fromJson(res.data['data']) }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } } diff --git a/lib/http/live.dart b/lib/http/live.dart index 9c0e530f..8b2a1c2f 100644 --- a/lib/http/live.dart +++ b/lib/http/live.dart @@ -82,11 +82,7 @@ class LiveHttp { if (res.data['code'] == 0) { return {'status': true, 'data': RoomInfoModel.fromJson(res.data['data'])}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -100,11 +96,7 @@ class LiveHttp { 'data': RoomInfoH5Model.fromJson(res.data['data']) }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -115,11 +107,7 @@ class LiveHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']['room']}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -130,11 +118,7 @@ class LiveHttp { if (res.data['code'] == 0) { return {'status': true, 'data': LiveDanmakuInfo.fromJson(res.data)}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } diff --git a/lib/http/member.dart b/lib/http/member.dart index e773c2fc..a388c8f6 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -300,11 +300,7 @@ class MemberHttp { 'data': MemberInfoModel.fromJson(res.data['data']) }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -313,11 +309,7 @@ class MemberHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -332,11 +324,7 @@ class MemberHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -476,11 +464,7 @@ class MemberHttp { .toList() }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -523,13 +507,9 @@ class MemberHttp { ), ); if (res.data['code'] == 0) { - return {'status': true, 'data': [], 'msg': '操作成功'}; + return {'status': true, 'msg': '操作成功'}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -555,11 +535,7 @@ class MemberHttp { .toList() }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -574,11 +550,7 @@ class MemberHttp { .toList() }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -595,11 +567,7 @@ class MemberHttp { 'data': MemberSeasonsDataModel.fromJson(res.data['data']['items_lists']) }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -687,11 +655,7 @@ class MemberHttp { debugPrint(err.toString()); } } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -702,11 +666,7 @@ class MemberHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } diff --git a/lib/http/msg.dart b/lib/http/msg.dart index d89ce2cf..ce5df05c 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -110,11 +110,7 @@ class MsgHttp { 'data': res.data['data'], }; } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -434,21 +430,13 @@ class MsgHttp { try { return { 'status': true, - 'data': SessionDataModel.fromJson(res.data['data']), + 'data': SessionDataModel.fromJson(res.data['data']).sessionList, }; } catch (err) { - return { - 'status': false, - 'date': [], - 'msg': err.toString(), - }; + return {'status': false, 'msg': err.toString()}; } } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -470,11 +458,7 @@ class MsgHttp { debugPrint('err🔟: $err'); } } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -500,11 +484,7 @@ class MsgHttp { debugPrint(err.toString()); } } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -532,7 +512,6 @@ class MsgHttp { } else { return { 'status': false, - 'date': [], 'msg': "message: ${res.data['message']}," " msg: ${res.data['msg']}," " code: ${res.data['code']}", @@ -581,11 +560,7 @@ class MsgHttp { 'data': res.data['data'], }; } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'] ?? res.data['msg'], - }; + return {'status': false, 'msg': res.data['message']}; } } diff --git a/lib/http/reply.dart b/lib/http/reply.dart index 75cf22f7..e21d4efe 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -351,11 +351,7 @@ class ReplyHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } @@ -379,11 +375,7 @@ class ReplyHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return { - 'status': false, - 'date': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } diff --git a/lib/http/search.dart b/lib/http/search.dart index 3d8b205a..8e7356ac 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -29,11 +29,7 @@ class SearchHttp { }; } - return { - 'status': false, - 'data': [], - 'msg': '请求错误', - }; + return {'status': false, 'msg': '请求错误'}; } // 获取搜索建议 @@ -50,19 +46,17 @@ class SearchHttp { 'status': true, 'data': resultMap['result'] is Map ? SearchSuggestModel.fromJson(resultMap['result']) - : [], + : null, }; } else { return { 'status': false, - 'data': [], 'msg': '请求错误 🙅', }; } } else { return { 'status': false, - 'data': [], 'msg': '请求错误 🙅', }; } @@ -210,11 +204,7 @@ class SearchHttp { 'data': BangumiInfoModel.fromJson(res.data['result']), }; } else { - return { - 'status': false, - 'data': [], - 'msg': res.data['message'], - }; + return {'status': false, 'msg': res.data['message']}; } } } diff --git a/lib/http/user.dart b/lib/http/user.dart index a7d12604..1394e9a3 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -2,6 +2,7 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/video/later.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import '../common/constants.dart'; @@ -43,7 +44,7 @@ class UserHttp { UserStat data = UserStat.fromJson(res.data['data']); return {'status': true, 'data': data}; } else { - return {'status': false, 'data': [], 'msg': res.data['message']}; + return {'status': false, 'msg': res.data['message']}; } } @@ -197,16 +198,29 @@ class UserHttp { } // 稍后再看 - static Future> seeYouLater() async { - var res = await Request().get(Api.seeYouLater); + static Future> seeYouLater({ + required int page, + int viewed = 0, + String keyword = '', + bool asc = false, + }) async { + var res = await Request().get( + Api.seeYouLater, + queryParameters: await WbiSign.makSign({ + 'pn': page, + 'ps': 20, + 'viewed': viewed, + 'key': keyword, + 'asc': asc, + 'need_split': true, + 'web_location': 333.881, + }), + ); if (res.data['code'] == 0) { if (res.data['data']['count'] == 0) { - return LoadingState.success({ - 'list': [], - 'count': 0, - }); + return LoadingState.success({'count': 0}); } - List list = []; + List list = []; if (res.data['data']?['list'] != null) { for (var i in res.data['data']['list']) { list.add(HotVideoItemModel.fromJson(i)); @@ -260,7 +274,7 @@ class UserHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return {'status': false, 'data': [], 'msg': res.data['message']}; + return {'status': false, 'msg': res.data['message']}; } } @@ -296,11 +310,10 @@ class UserHttp { } // 移除已观看 - static Future toViewDel({List? aids}) async { + static Future toViewDel({required List aids}) async { final Map params = { - 'jsonp': 'jsonp', 'csrf': await Request.getCsrf(), - if (aids != null) 'aid': aids.join(',') else 'viewed': true + 'resources': aids.join(',') }; dynamic res = await Request().post( Api.toViewDel, @@ -333,12 +346,12 @@ class UserHttp { } } - // 清空稍后再看 - static Future toViewClear() async { + // 清空稍后再看 // clean_type: null->all, 1->invalid, 2->viewed + static Future toViewClear([int? cleanType]) async { var res = await Request().post( Api.toViewClear, queryParameters: { - 'jsonp': 'jsonp', + if (cleanType != null) 'clean_type': cleanType, 'csrf': await Request.getCsrf(), }, ); @@ -631,7 +644,7 @@ class UserHttp { static List extractScriptContents(String htmlContent) { RegExp scriptRegExp = RegExp(r'