From ebb1d78dbb383a2b2c5a83116184fed0f85705d5 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 1 Dec 2023 21:21:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20accessKey=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/constants.dart | 6 +- lib/http/api.dart | 12 ++++ lib/http/member.dart | 92 +++++++++++++++++++++++++- lib/pages/setting/privacy_setting.dart | 11 +++ lib/utils/utils.dart | 16 +++++ 5 files changed, 134 insertions(+), 3 deletions(-) diff --git a/lib/common/constants.dart b/lib/common/constants.dart index 08a54805d..cac136887 100644 --- a/lib/common/constants.dart +++ b/lib/common/constants.dart @@ -9,7 +9,11 @@ class StyleString { } class Constants { - static const String appKey = '27eb53fc9058f8c3'; + // 27eb53fc9058f8c3 移动端 Android + // 4409e2ce8ffd12b8 TV端 + static const String appKey = '4409e2ce8ffd12b8'; + // 59b43e04ad6965f34319062b478f83dd TV端 + static const String appSec = '59b43e04ad6965f34319062b478f83dd'; static const String thirdSign = '04224646d1fea004e79606d3b038c84a'; static const String thirdApi = 'https://www.mcbbs.net/template/mcbbs/image/special_photo_bg.png'; diff --git a/lib/http/api.dart b/lib/http/api.dart index af7d8b9e6..0125c7423 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -373,6 +373,18 @@ class Api { static const getWebKey = 'https://passport.bilibili.com/x/passport-login/web/key'; + /// cookie转access_key + static const cookieToKey = + 'https://passport.bilibili.com/x/passport-tv-login/h5/qrcode/confirm'; + + /// 申请二维码(TV端) + static const getTVCode = + 'https://passport.snm0516.aisee.tv/x/passport-tv-login/qrcode/auth_code'; + + ///扫码登录（TV端） + static const qrcodePoll = + 'https://passport.bilibili.com/x/passport-tv-login/qrcode/poll'; + /// 置顶视频 static const getTopVideoApi = '/x/space/top/arc'; diff --git a/lib/http/member.dart b/lib/http/member.dart index 9dc6da856..a2af8d82e 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -1,5 +1,6 @@ -import 'dart:ffi'; - +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/common/constants.dart'; import 'package:pilipala/http/index.dart'; import 'package:pilipala/models/dynamics/result.dart'; import 'package:pilipala/models/follow/result.dart'; @@ -8,6 +9,8 @@ import 'package:pilipala/models/member/coin.dart'; import 'package:pilipala/models/member/info.dart'; import 'package:pilipala/models/member/seasons.dart'; import 'package:pilipala/models/member/tags.dart'; +import 'package:pilipala/utils/storage.dart'; +import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/wbi_sign.dart'; class MemberHttp { @@ -359,4 +362,89 @@ class MemberHttp { }; } } + + // 获取TV authCode + static Future getTVCode() async { + SmartDialog.showLoading(); + var params = { + 'appkey': Constants.appKey, + 'local_id': '0', + 'ts': (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(), + }; + String sign = Utils.appSign( + params, + Constants.appKey, + Constants.appSec, + ); + var res = await Request() + .post(Api.getTVCode, queryParameters: {...params, 'sign': sign}); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': res.data['data']['auth_code'], + 'msg': '操作成功' + }; + } else { + return { + 'status': false, + 'data': [], + 'msg': res.data['message'], + }; + } + } + + // 获取access_key + static Future cookieToKey() async { + var authCodeRes = await getTVCode(); + if (authCodeRes['status']) { + var res = await Request().post(Api.cookieToKey, queryParameters: { + 'auth_code': authCodeRes['data'], + 'build': 708200, + 'csrf': await Request.getCsrf(), + }); + await Future.delayed(const Duration(milliseconds: 300)); + qrcodePoll(authCodeRes['data']); + if (res.data['code'] == 0) { + return {'status': true, 'data': [], 'msg': '操作成功'}; + } else { + return { + 'status': false, + 'data': [], + 'msg': res.data['message'], + }; + } + } + } + + static Future qrcodePoll(authCode) async { + var params = { + 'appkey': Constants.appKey, + 'auth_code': authCode.toString(), + 'local_id': '0', + 'ts': (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(), + }; + String sign = Utils.appSign( + params, + Constants.appKey, + Constants.appSec, + ); + var res = await Request() + .post(Api.qrcodePoll, queryParameters: {...params, 'sign': sign}); + SmartDialog.dismiss(); + if (res.data['code'] == 0) { + String accessKey = res.data['data']['access_token']; + Box localCache = GStrorage.localCache; + Box userInfoCache = GStrorage.userInfo; + var userInfo = userInfoCache.get('userInfoCache'); + localCache.put( + LocalCacheKey.accessKey, {'mid': userInfo.mid, 'value': accessKey}); + return {'status': true, 'data': [], 'msg': '操作成功'}; + } else { + return { + 'status': false, + 'data': [], + 'msg': res.data['message'], + }; + } + } } diff --git a/lib/pages/setting/privacy_setting.dart b/lib/pages/setting/privacy_setting.dart index a6d085abd..07a02318c 100644 --- a/lib/pages/setting/privacy_setting.dart +++ b/lib/pages/setting/privacy_setting.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:pilipala/http/member.dart'; import 'package:pilipala/utils/storage.dart'; class PrivacySetting extends StatefulWidget { @@ -53,6 +54,16 @@ class _PrivacySettingState extends State { title: Text('黑名单管理', style: titleStyle), subtitle: Text('已拉黑用户', style: subTitleStyle), ), + ListTile( + onTap: () { + if (!userLogin) { + SmartDialog.showToast('请先登录'); + } + MemberHttp.cookieToKey(); + }, + dense: false, + title: Text('刷新access_key', style: titleStyle), + ), ], ), ); diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 19979df66..25488d592 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -2,8 +2,10 @@ // ignore_for_file: non_constant_identifier_names import 'dart:async'; +import 'dart:convert'; import 'dart:io'; import 'dart:math'; +import 'package:crypto/crypto.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; @@ -297,4 +299,18 @@ class Utils { return '$formattedHours:$formattedMinutes'; } + + static String appSign( + Map params, String appkey, String appsec) { + params['appkey'] = appkey; + var searchParams = Uri(queryParameters: params).query; + var sortedParams = searchParams.split('&')..sort(); + var sortedQueryString = sortedParams.join('&'); + + var appsecString = sortedQueryString + appsec; + var md5Digest = md5.convert(utf8.encode(appsecString)); + var md5String = md5Digest.toString(); // 获取MD5哈希值 + + return md5String; + } } From 00f84e1a1c41cd9b484fbc0951588fe46907a9b8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Dec 2023 21:33:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?mod:=20=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 18 +++++ ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- lib/pages/history_search/view.dart | 1 - lib/pages/main/view.dart | 4 +- lib/pages/preview/view.dart | 1 - pubspec.lock | 68 +++++++++++-------- pubspec.yaml | 6 +- 8 files changed, 63 insertions(+), 39 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9d796293a..7a7e5357c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,6 +1,12 @@ PODS: - appscheme (1.0.4): - Flutter + - audio_service (0.0.1): + - Flutter + - audio_session (0.0.1): + - Flutter + - auto_orientation (0.0.1): + - Flutter - connectivity_plus (0.0.1): - Flutter - ReachabilitySwift @@ -56,6 +62,9 @@ PODS: DEPENDENCIES: - appscheme (from `.symlinks/plugins/appscheme/ios`) + - audio_service (from `.symlinks/plugins/audio_service/ios`) + - audio_session (from `.symlinks/plugins/audio_session/ios`) + - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`) - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) @@ -88,6 +97,12 @@ SPEC REPOS: EXTERNAL SOURCES: appscheme: :path: ".symlinks/plugins/appscheme/ios" + audio_service: + :path: ".symlinks/plugins/audio_service/ios" + audio_session: + :path: ".symlinks/plugins/audio_session/ios" + auto_orientation: + :path: ".symlinks/plugins/auto_orientation/ios" connectivity_plus: :path: ".symlinks/plugins/connectivity_plus/ios" device_info_plus: @@ -135,6 +150,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: appscheme: b1c3f8862331cb20430cf9e0e4af85dbc1572ad8 + audio_service: f509d65da41b9521a61f1c404dd58651f265a567 + audio_session: 4f3e461722055d21515cf3261b64c973c062f345 + auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index eeb03befe..c0883366f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -157,7 +157,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a33..a6b826db2 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { onChoose: null, onUpdateMultiple: () => null, ); - ; } }, ) diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index ee8d38299..33b46ad96 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -113,8 +113,8 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { MediaQuery.of(context).size.width * 9 / 16; localCache.put('sheetHeight', sheetHeight); localCache.put('statusBarHeight', statusBarHeight); - return WillPopScope( - onWillPop: () => _mainController.onBackPressed(context), + return PopScope( + onPopInvoked: (bool status) => _mainController.onBackPressed(context), child: Scaffold( extendBody: true, body: FadeTransition( diff --git a/lib/pages/preview/view.dart b/lib/pages/preview/view.dart index 22cc8952e..1c37c8332 100644 --- a/lib/pages/preview/view.dart +++ b/lib/pages/preview/view.dart @@ -159,7 +159,6 @@ class _ImagePreviewState extends State _previewController.onChange(index), canScrollPage: (GestureDetails? gestureDetails) => gestureDetails!.totalScale! <= 1.0, - preloadPagesCount: 2, itemCount: widget.imgList!.length, itemBuilder: (BuildContext context, int index) { return ExtendedImage.network( diff --git a/pubspec.lock b/pubspec.lock index 3b97dbe71..763d23c78 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -253,10 +253,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" connectivity_plus: dependency: "direct main" description: @@ -421,18 +421,18 @@ packages: dependency: "direct main" description: name: extended_image - sha256: e77d18f956649ba6e5ecebd0cb68542120886336a75ee673788145bd4c3f0767 + sha256: d7f091d068fcac7246c4b22a84b8dac59a62e04d29a5c172710c696e67a22f94 url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.2.0" extended_image_library: dependency: transitive description: name: extended_image_library - sha256: bb8d08c504ebc73d476ec1c99451a61f12e95538869e734fc4f55a3a2d5c98ec + sha256: "9b55fc5ebc65fad984de66b8f177a1bef2a84d79203c9c213f75ff83c2c29edd" url: "https://pub.dev" source: hosted - version: "3.5.3" + version: "4.0.1" extended_list: dependency: transitive description: @@ -551,10 +551,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" + sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.17" flutter_smart_dialog: dependency: "direct main" description: @@ -580,10 +580,10 @@ packages: dependency: "direct main" description: name: flutter_volume_controller - sha256: "1161957826183b46916adb4f1c9f91befce0d8415bd3fcd781f7faed9df62d46" + sha256: "0f10cc759499cb6c3e152a8f6ff8e5ce385b99db7e1f586d1a29d8e6c11f4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" flutter_web_plugins: dependency: transitive description: flutter @@ -721,10 +721,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -793,18 +793,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" media_kit: dependency: "direct main" description: @@ -881,10 +881,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -1138,10 +1138,10 @@ packages: dependency: "direct main" description: name: saver_gallery - sha256: "3131bba4257f69901437c0f1ebd692201ca5f34512d42667513a3802f1c171d1" + sha256: "2657953427ebe5a3b2d08157d41587c01923ccce3f1a616d55082be7470f8530" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" screen_brightness: dependency: "direct main" description: @@ -1247,10 +1247,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: @@ -1271,10 +1271,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" status_bar_control: dependency: "direct main" description: @@ -1287,10 +1287,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1335,10 +1335,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -1531,6 +1531,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1620,5 +1628,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.2.0-194.0.dev <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index f600573b7..c294a3254 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,8 +49,8 @@ dependencies: # 图片 cached_network_image: ^3.3.0 - extended_image: ^8.0.2 - saver_gallery: ^2.0.1 + extended_image: ^8.2.0 + saver_gallery: ^3.0.1 # 存储 path_provider: ^2.1.1 @@ -94,7 +94,7 @@ dependencies: audio_session: ^0.1.16 # 音量、亮度、屏幕控制 - flutter_volume_controller: ^1.3.0 + flutter_volume_controller: ^1.3.1 screen_brightness: ^0.2.2+1 wakelock_plus: ^1.1.1 universal_platform: ^1.0.0+1