diff --git a/lib/common/constants.dart b/lib/common/constants.dart index 145925c33..4daad0be8 100644 --- a/lib/common/constants.dart +++ b/lib/common/constants.dart @@ -1,4 +1,3 @@ -import 'package:PiliPlus/http/constants.dart'; import 'package:flutter/material.dart'; class StyleString { @@ -43,7 +42,7 @@ class Constants { static const baseHeaders = { 'connection': 'keep-alive', 'accept-encoding': 'br,gzip', - 'referer': HttpString.baseUrl, + // 'referer': HttpString.baseUrl, 'env': 'prod', 'app-key': 'android64', 'x-bili-aurora-zone': 'sh001', diff --git a/lib/http/search.dart b/lib/http/search.dart index ddacc36ee..ebb095317 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -3,7 +3,6 @@ import 'dart:convert'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/http/ua_type.dart'; import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/models/search/suggest.dart'; @@ -56,7 +55,6 @@ class SearchHttp { int? categoryId, int? pubBegin, int? pubEnd, - required String qvId, String? gaiaVtoken, required ValueChanged onSuccess, }) async { @@ -72,16 +70,8 @@ class SearchHttp { 'category_id': ?categoryId, 'pubtime_begin_s': ?pubBegin, 'pubtime_end_s': ?pubEnd, - // 'ad_resource': 5654, - '__refresh__': true, - '_extra': '', - 'context': '', 'page_size': 20, - 'from_source': '', - 'from_spmid': 333.337, 'platform': 'pc', - 'source_tag': 3, - 'qv_id': qvId, 'web_location': 1430654, 'gaia_vtoken': ?gaiaVtoken, }); @@ -91,10 +81,9 @@ class SearchHttp { options: Options( headers: { if (gaiaVtoken != null) 'cookie': 'x-bili-gaia-vtoken=$gaiaVtoken', - 'user-agent': UaType.pc.ua, 'origin': 'https://search.bilibili.com', 'referer': - 'https://search.bilibili.com/${searchType.name}?keyword=$keyword', + 'https://search.bilibili.com/${searchType.name}?keyword=${Uri.encodeQueryComponent(keyword)}', }, ), ); diff --git a/lib/pages/audio/controller.dart b/lib/pages/audio/controller.dart index 6d29e1d4a..56a174a67 100644 --- a/lib/pages/audio/controller.dart +++ b/lib/pages/audio/controller.dart @@ -604,6 +604,7 @@ class AudioController extends GetxController itemType = item.itemType; _queryPlayUrl().then((res) { if (res) { + _videoDetailController = null; _updateCurrItem(audioItem); } }); diff --git a/lib/pages/search_panel/controller.dart b/lib/pages/search_panel/controller.dart index 4fe5eebf0..d5b8a48ce 100644 --- a/lib/pages/search_panel/controller.dart +++ b/lib/pages/search_panel/controller.dart @@ -8,7 +8,6 @@ import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/pages/search_result/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -83,8 +82,6 @@ class SearchPanelController, T> return false; } - final qvId = Utils.generateRandomString(32); - String? gaiaVtoken; @override @@ -100,7 +97,6 @@ class SearchPanelController, T> categoryId: articleZoneType?.value.categoryId, pubBegin: pubBegin, pubEnd: pubEnd, - qvId: qvId, gaiaVtoken: gaiaVtoken, onSuccess: (String gaiaVtoken) { this.gaiaVtoken = gaiaVtoken; diff --git a/lib/utils/accounts/account_manager/account_mgr.dart b/lib/utils/accounts/account_manager/account_mgr.dart index c576619e9..f55c1f7c0 100644 --- a/lib/utils/accounts/account_manager/account_mgr.dart +++ b/lib/utils/accounts/account_manager/account_mgr.dart @@ -163,7 +163,9 @@ class AccountManager extends Interceptor { ); } - options.headers.addAll(account.headers); + options.headers + ..addAll(account.headers) + ..['referer'] ??= HttpString.baseUrl; // app端不需要管理cookie if (path.startsWith(HttpString.appBaseUrl)) {