From 45aaa3d075679d8033849913e965a31decbdd3ed Mon Sep 17 00:00:00 2001 From: orz12 Date: Mon, 17 Jun 2024 01:26:52 +0800 Subject: [PATCH] Fix typo --- lib/common/widgets/custom_toast.dart | 2 +- lib/common/widgets/list_sheet.dart | 2 +- lib/common/widgets/network_img_layer.dart | 2 +- lib/common/widgets/video_popup_menu.dart | 6 +- lib/http/init.dart | 6 +- lib/http/interceptor.dart | 2 +- lib/http/member.dart | 4 +- lib/http/search.dart | 2 +- lib/http/video.dart | 12 ++-- lib/main.dart | 10 +-- lib/models/video/play/quality.dart | 2 +- lib/pages/about/index.dart | 12 ++-- lib/pages/bangumi/controller.dart | 2 +- .../bangumi/introduction/controller.dart | 2 +- lib/pages/bangumi/view.dart | 36 +++++----- ...angumu_card_v.dart => bangumi_card_v.dart} | 0 lib/pages/bangumi/widgets/bangumi_panel.dart | 2 +- lib/pages/blacklist/index.dart | 2 +- lib/pages/danmaku/view.dart | 2 +- lib/pages/danmaku_block/index.dart | 2 +- lib/pages/dynamics/controller.dart | 4 +- lib/pages/dynamics/detail/controller.dart | 2 +- lib/pages/dynamics/tab/controller.dart | 2 +- lib/pages/dynamics/tab/view.dart | 4 +- lib/pages/dynamics/view.dart | 2 +- lib/pages/dynamics/widgets/content_panel.dart | 10 +-- .../dynamics/widgets/rich_node_panel.dart | 40 +++++------ lib/pages/dynamics/widgets/up_panel.dart | 2 +- lib/pages/fan/controller.dart | 2 +- lib/pages/fav/controller.dart | 2 +- lib/pages/follow/controller.dart | 2 +- lib/pages/history/controller.dart | 2 +- lib/pages/home/controller.dart | 6 +- lib/pages/home/widgets/app_bar.dart | 2 +- lib/pages/html/controller.dart | 2 +- lib/pages/live/controller.dart | 2 +- lib/pages/live_room/controller.dart | 2 +- .../live_room/widgets/bottom_control.dart | 2 +- lib/pages/main/controller.dart | 4 +- lib/pages/main/view.dart | 4 +- lib/pages/media/controller.dart | 4 +- lib/pages/member/controller.dart | 2 +- lib/pages/member/view.dart | 4 +- lib/pages/member_dynamics/view.dart | 2 +- lib/pages/mine/controller.dart | 12 ++-- lib/pages/rank/controller.dart | 2 +- lib/pages/rcmd/controller.dart | 2 +- lib/pages/search/controller.dart | 4 +- lib/pages/search_panel/view.dart | 2 +- .../widgets/media_bangumi_panel.dart | 2 +- lib/pages/setting/controller.dart | 8 +-- lib/pages/setting/extra_setting.dart | 2 +- lib/pages/setting/pages/color_select.dart | 2 +- lib/pages/setting/pages/display_mode.dart | 10 +-- lib/pages/setting/pages/font_size_select.dart | 8 +-- lib/pages/setting/pages/home_tabbar_set.dart | 2 +- lib/pages/setting/pages/play_speed_set.dart | 4 +- lib/pages/setting/play_setting.dart | 6 +- lib/pages/setting/privacy_setting.dart | 8 +-- lib/pages/setting/recommend_setting.dart | 6 +- lib/pages/setting/style_setting.dart | 4 +- lib/pages/setting/video_setting.dart | 2 +- lib/pages/setting/widgets/select_item.dart | 2 +- lib/pages/setting/widgets/switch_item.dart | 2 +- lib/pages/subscription/controller.dart | 2 +- lib/pages/video/detail/controller.dart | 6 +- .../video/detail/introduction/controller.dart | 10 +-- lib/pages/video/detail/introduction/view.dart | 2 +- .../introduction/widgets/intro_detail.dart | 4 +- .../video/detail/related/controller.dart | 2 +- lib/pages/video/detail/related/view.dart | 20 +++--- lib/pages/video/detail/reply/controller.dart | 2 +- .../detail/reply/widgets/reply_item.dart | 40 +++++------ lib/pages/video/detail/reply_new/view.dart | 4 +- lib/pages/video/detail/view.dart | 70 +++++++++---------- lib/pages/video/detail/widgets/ai_detail.dart | 4 +- .../video/detail/widgets/header_control.dart | 4 +- lib/pages/webview/controller.dart | 4 +- lib/pages/whisper/controller.dart | 2 +- lib/pages/whisper_detail/controller.dart | 2 +- lib/pages/whisper_detail/view.dart | 2 +- .../whisper_detail/widget/chat_item.dart | 2 +- lib/plugin/pl_player/controller.dart | 18 ++--- .../models/bottom_progress_behavior.dart | 10 +-- lib/plugin/pl_player/utils/fullscreen.dart | 2 +- lib/plugin/pl_player/view.dart | 10 +-- lib/router/app_pages.dart | 4 +- lib/services/audio_handler.dart | 2 +- lib/utils/app_scheme.dart | 2 +- lib/utils/data.dart | 4 +- lib/utils/feed_back.dart | 2 +- lib/utils/grid.dart | 4 +- lib/utils/recommend_filter.dart | 2 +- lib/utils/storage.dart | 10 +-- lib/utils/wbi_sign.dart | 2 +- 95 files changed, 282 insertions(+), 282 deletions(-) rename lib/pages/bangumi/widgets/{bangumu_card_v.dart => bangumi_card_v.dart} (100%) diff --git a/lib/common/widgets/custom_toast.dart b/lib/common/widgets/custom_toast.dart index a7975381..40998c45 100644 --- a/lib/common/widgets/custom_toast.dart +++ b/lib/common/widgets/custom_toast.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:PiliPalaX/utils/storage.dart'; -Box setting = GStrorage.setting; +Box setting = GStorage.setting; class CustomToast extends StatelessWidget { const CustomToast({super.key, required this.msg}); diff --git a/lib/common/widgets/list_sheet.dart b/lib/common/widgets/list_sheet.dart index 882c4899..7fd2ed8a 100644 --- a/lib/common/widgets/list_sheet.dart +++ b/lib/common/widgets/list_sheet.dart @@ -45,7 +45,7 @@ class ListSheet { return ListTile( onTap: () { if (episode.badge != null && episode.badge == "会员") { - dynamic userInfo = GStrorage.userInfo.get('userInfoCache'); + dynamic userInfo = GStorage.userInfo.get('userInfoCache'); int vipStatus = 0; if (userInfo != null) { vipStatus = userInfo.vipStatus; diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart index aeeedae3..0a575b63 100644 --- a/lib/common/widgets/network_img_layer.dart +++ b/lib/common/widgets/network_img_layer.dart @@ -7,7 +7,7 @@ import 'package:PiliPalaX/utils/global_data.dart'; import '../../utils/storage.dart'; import '../constants.dart'; -Box setting = GStrorage.setting; +Box setting = GStorage.setting; class NetworkImgLayer extends StatelessWidget { const NetworkImgLayer({ diff --git a/lib/common/widgets/video_popup_menu.dart b/lib/common/widgets/video_popup_menu.dart index 69253dc2..e520f50a 100644 --- a/lib/common/widgets/video_popup_menu.dart +++ b/lib/common/widgets/video_popup_menu.dart @@ -74,7 +74,7 @@ class VideoPopupMenu extends StatelessWidget { // 不感兴趣 PopupMenuItem( onTap: () async { - String? accessKey = GStrorage.localCache + String? accessKey = GStorage.localCache .get(LocalCacheKey.accessKey, defaultValue: {})['value']; if (accessKey == null || accessKey == "") { SmartDialog.showToast("本操作使用app端接口，请前往【隐私设置】刷新access_key"); @@ -262,13 +262,13 @@ class VideoPopupMenu extends StatelessWidget { act: 5, reSrc: 11, ); - List blackMidsList = GStrorage.setting + List blackMidsList = GStorage.setting .get(SettingBoxKey.blackMidsList, defaultValue: [-1]) .map((i) => i as int) .toList(); blackMidsList.insert(0, videoItem.owner.mid); - GStrorage.setting + GStorage.setting .put(SettingBoxKey.blackMidsList, blackMidsList); Get.back(); SmartDialog.showToast(res['msg'] ?? '成功'); diff --git a/lib/http/init.dart b/lib/http/init.dart index 7f706d32..18bccb65 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -23,8 +23,8 @@ class Request { static late CookieManager cookieManager; static late final Dio dio; factory Request() => _instance; - Box setting = GStrorage.setting; - static Box localCache = GStrorage.localCache; + Box setting = GStorage.setting; + static Box localCache = GStorage.localCache; late bool enableSystemProxy; late String systemProxyHost; late String systemProxyPort; @@ -32,7 +32,7 @@ class Request { /// 设置cookie static setCookie() async { - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; final String cookiePath = await Utils.getCookiePath(); final PersistCookieJar cookieJar = PersistCookieJar( ignoreExpires: true, diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart index 4b4d4bd1..8871359a 100644 --- a/lib/http/interceptor.dart +++ b/lib/http/interceptor.dart @@ -27,7 +27,7 @@ class ApiInterceptor extends Interceptor { final String? accessKey = uri.queryParameters['access_key']; final String? mid = uri.queryParameters['mid']; try { - Box localCache = GStrorage.localCache; + Box localCache = GStorage.localCache; localCache.put(LocalCacheKey.accessKey, {'mid': mid, 'value': accessKey}); } catch (_) {} diff --git a/lib/http/member.dart b/lib/http/member.dart index 786d9d0b..d87e8548 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -475,8 +475,8 @@ class MemberHttp { .post(Api.qrcodePoll, queryParameters: {...params, 'sign': sign}); if (res.data['code'] == 0) { String accessKey = res.data['data']['access_token']; - Box localCache = GStrorage.localCache; - Box userInfoCache = GStrorage.userInfo; + Box localCache = GStorage.localCache; + Box userInfoCache = GStorage.userInfo; var userInfo = userInfoCache.get('userInfoCache'); localCache.put( LocalCacheKey.accessKey, {'mid': userInfo.mid, 'value': accessKey}); diff --git a/lib/http/search.dart b/lib/http/search.dart index 6e00ce3e..5666ffd9 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -9,7 +9,7 @@ import '../utils/storage.dart'; import 'index.dart'; class SearchHttp { - static Box setting = GStrorage.setting; + static Box setting = GStorage.setting; static Future hotSearchList() async { var res = await Request().get(Api.hotSearchList); if (res.data is String) { diff --git a/lib/http/video.dart b/lib/http/video.dart index 966df10a..324c87ee 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -23,11 +23,11 @@ import 'init.dart'; /// 返回{'status': bool, 'data': List} /// view层根据 status 判断渲染逻辑 class VideoHttp { - static Box localCache = GStrorage.localCache; - static Box setting = GStrorage.setting; + static Box localCache = GStorage.localCache; + static Box setting = GStorage.setting; static bool enableRcmdDynamic = setting.get(SettingBoxKey.enableRcmdDynamic, defaultValue: true); - static Box userInfoCache = GStrorage.userInfo; + static Box userInfoCache = GStorage.userInfo; // 首页推荐视频 static Future rcmdVideoList({required int ps, required int freshIdx}) async { @@ -322,7 +322,7 @@ class VideoHttp { // （取消）点踩 static Future dislikeVideo({required String bvid, required bool type}) async { - String? accessKey = GStrorage.localCache + String? accessKey = GStorage.localCache .get(LocalCacheKey.accessKey, defaultValue: {})['value']; if (accessKey == null || accessKey == "") { return {'status': false, 'msg': "本操作使用app端接口，请前往【隐私设置】刷新access_key"}; @@ -352,7 +352,7 @@ class VideoHttp { required int id, int? reasonId, int? feedbackId}) async { - String? accessKey = GStrorage.localCache + String? accessKey = GStorage.localCache .get(LocalCacheKey.accessKey, defaultValue: {})['value']; if (accessKey == null || accessKey == "") { return {'status': false, 'msg': "本操作使用app端接口，请前往【隐私设置】刷新access_key"}; @@ -383,7 +383,7 @@ class VideoHttp { required int id, int? reasonId, int? feedbackId}) async { - String? accessKey = GStrorage.localCache + String? accessKey = GStorage.localCache .get(LocalCacheKey.accessKey, defaultValue: {})['value']; if (accessKey == null || accessKey == "") { return {'status': false, 'msg': "本操作使用app端接口，请前往【隐私设置】刷新access_key"}; diff --git a/lib/main.dart b/lib/main.dart index 2bf3152d..956e55d9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -29,12 +29,12 @@ import './services/loggeer.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); MediaKit.ensureInitialized(); - await GStrorage.init(); - if (GStrorage.setting + await GStorage.init(); + if (GStorage.setting .get(SettingBoxKey.autoClearCache, defaultValue: false)) { await CacheManage.clearLibraryCache(); } - if (GStrorage.setting + if (GStorage.setting .get(SettingBoxKey.horizontalScreen, defaultValue: false)) { await SystemChrome.setPreferredOrientations( //支持竖屏与横屏 @@ -92,7 +92,7 @@ void main() async { statusBarColor: Colors.transparent, )); Data.init(); - PiliSchame.init(); + PiliScheme.init(); } class MyApp extends StatelessWidget { @@ -100,7 +100,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; // 主题色 Color defaultColor = colorThemeTypes[setting.get(SettingBoxKey.customColor, defaultValue: 0)] diff --git a/lib/models/video/play/quality.dart b/lib/models/video/play/quality.dart index 6cae84cc..e52c0c2c 100644 --- a/lib/models/video/play/quality.dart +++ b/lib/models/video/play/quality.dart @@ -2,7 +2,7 @@ enum VideoQuality { speed240, - flunt360, + fluent360, clear480, high720, high72060, diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index eb4bcbf6..fdca201c 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -196,7 +196,7 @@ class _AboutPageState extends State { title: const Text('导出设置至剪贴板'), onTap: () async { Get.back(); - String data = await GStrorage.exportAllSettings(); + String data = await GStorage.exportAllSettings(); Clipboard.setData(ClipboardData(text: data)); SmartDialog.showToast('已复制到剪贴板'); }, @@ -231,7 +231,7 @@ class _AboutPageState extends State { onPressed: () async { Get.back(); try { - await GStrorage.importAllSettings( + await GStorage.importAllSettings( data.text!); SmartDialog.showToast('导入成功'); } catch (e) { @@ -271,9 +271,9 @@ class _AboutPageState extends State { TextButton( onPressed: () { Get.back(); - GStrorage.setting.clear(); - GStrorage.localCache.clear(); - GStrorage.video.clear(); + GStorage.setting.clear(); + GStorage.localCache.clear(); + GStorage.video.clear(); SmartDialog.showToast('重置成功'); }, child: const Text('确定'), @@ -291,7 +291,7 @@ class _AboutPageState extends State { } class AboutController extends GetxController { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; final SettingController settingController = Get.put(SettingController()); RxString currentVersion = ''.obs; RxString remoteVersion = ''.obs; diff --git a/lib/pages/bangumi/controller.dart b/lib/pages/bangumi/controller.dart index b8e6577d..3549c0de 100644 --- a/lib/pages/bangumi/controller.dart +++ b/lib/pages/bangumi/controller.dart @@ -11,7 +11,7 @@ class BangumiController extends GetxController { RxList bangumiFollowList = [].obs; int _currentPage = 1; bool isLoadingMore = true; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; RxBool userLogin = false.obs; late int mid; var userInfo; diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index 7b0efd9a..ba403f15 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -51,7 +51,7 @@ class BangumiIntroController extends GetxController { RxBool hasCoin = false.obs; // 是否收藏 RxBool hasFav = false.obs; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; bool userLogin = false; Rx favFolderData = FavFolderData().obs; List addMediaIdsNew = []; diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index e8f924d4..1716254f 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -12,7 +12,7 @@ import 'package:PiliPalaX/pages/main/index.dart'; import '../../utils/grid.dart'; import 'controller.dart'; -import 'widgets/bangumu_card_v.dart'; +import 'widgets/bangumi_card_v.dart'; class BangumiPage extends StatefulWidget { const BangumiPage({super.key}); @@ -23,7 +23,7 @@ class BangumiPage extends StatefulWidget { class _BangumiPageState extends State with AutomaticKeepAliveClientMixin { - final BangumiController _bangumidController = Get.put(BangumiController()); + final BangumiController _bangumiController = Get.put(BangumiController()); late Future? _futureBuilderFuture; late Future? _futureBuilderFutureFollow; late ScrollController scrollController; @@ -34,20 +34,20 @@ class _BangumiPageState extends State @override void initState() { super.initState(); - scrollController = _bangumidController.scrollController; + scrollController = _bangumiController.scrollController; StreamController mainStream = Get.find().bottomBarStream; StreamController searchBarStream = Get.find().searchBarStream; - _futureBuilderFuture = _bangumidController.queryBangumiListFeed(); - _futureBuilderFutureFollow = _bangumidController.queryBangumiFollow(); + _futureBuilderFuture = _bangumiController.queryBangumiListFeed(); + _futureBuilderFutureFollow = _bangumiController.queryBangumiFollow(); scrollController.addListener( () async { if (scrollController.position.pixels >= scrollController.position.maxScrollExtent - 200) { EasyThrottle.throttle('my-throttler', const Duration(seconds: 1), () { - _bangumidController.isLoadingMore = true; - _bangumidController.onLoad(); + _bangumiController.isLoadingMore = true; + _bangumiController.onLoad(); }); } @@ -75,17 +75,17 @@ class _BangumiPageState extends State super.build(context); return RefreshIndicator( onRefresh: () async { - await _bangumidController.queryBangumiListFeed(); - return _bangumidController.queryBangumiFollow(); + await _bangumiController.queryBangumiListFeed(); + return _bangumiController.queryBangumiFollow(); }, child: CustomScrollView( - controller: _bangumidController.scrollController, + controller: _bangumiController.scrollController, physics: const AlwaysScrollableScrollPhysics(), slivers: [ SliverToBoxAdapter( child: Obx( () => Visibility( - visible: _bangumidController.userLogin.value, + visible: _bangumiController.userLogin.value, child: Column( children: [ Padding( @@ -103,7 +103,7 @@ class _BangumiPageState extends State onPressed: () { setState(() { _futureBuilderFutureFollow = - _bangumidController.queryBangumiFollow(); + _bangumiController.queryBangumiFollow(); }); }, icon: const Icon( @@ -126,7 +126,7 @@ class _BangumiPageState extends State return const SizedBox(); } Map data = snapshot.data as Map; - List list = _bangumidController.bangumiFollowList; + List list = _bangumiController.bangumiFollowList; if (data['status']) { return Obx( () => list.isNotEmpty @@ -140,14 +140,14 @@ class _BangumiPageState extends State margin: EdgeInsets.only( left: StyleString.safeSpace, right: index == - _bangumidController + _bangumiController .bangumiFollowList .length - 1 ? StyleString.safeSpace : 0), child: BangumiCardV( - bangumiItem: _bangumidController + bangumiItem: _bangumiController .bangumiFollowList[index], ), ); @@ -197,18 +197,18 @@ class _BangumiPageState extends State Map data = snapshot.data as Map; if (data['status']) { return Obx(() => contentGrid( - _bangumidController, _bangumidController.bangumiList)); + _bangumiController, _bangumiController.bangumiList)); } else { return HttpError( errMsg: data['msg'], fn: () { _futureBuilderFuture = - _bangumidController.queryBangumiListFeed(); + _bangumiController.queryBangumiListFeed(); }, ); } } else { - return contentGrid(_bangumidController, []); + return contentGrid(_bangumiController, []); } }, ), diff --git a/lib/pages/bangumi/widgets/bangumu_card_v.dart b/lib/pages/bangumi/widgets/bangumi_card_v.dart similarity index 100% rename from lib/pages/bangumi/widgets/bangumu_card_v.dart rename to lib/pages/bangumi/widgets/bangumi_card_v.dart diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index de8e1354..d322c1e0 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -28,7 +28,7 @@ class _BangumiPanelState extends State { late int currentIndex; final ScrollController listViewScrollCtr = ScrollController(); final ScrollController listViewScrollCtr_2 = ScrollController(); - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; dynamic userInfo; // 默认未开通 int vipStatus = 0; diff --git a/lib/pages/blacklist/index.dart b/lib/pages/blacklist/index.dart index 54ed1eb3..d6849b2b 100644 --- a/lib/pages/blacklist/index.dart +++ b/lib/pages/blacklist/index.dart @@ -22,7 +22,7 @@ class _BlackListPageState extends State { final ScrollController scrollController = ScrollController(); Future? _futureBuilderFuture; bool _isLoadingMore = false; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; @override void initState() { diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart index 89cf8c3e..b45bfe4f 100644 --- a/lib/pages/danmaku/view.dart +++ b/lib/pages/danmaku/view.dart @@ -28,7 +28,7 @@ class _PlDanmakuState extends State { late PlDanmakuController _plDanmakuController; DanmakuController? _controller; // bool danmuPlayStatus = true; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late bool enableShowDanmaku; late List blockTypes; late double showArea; diff --git a/lib/pages/danmaku_block/index.dart b/lib/pages/danmaku_block/index.dart index dc8e6ade..56e9e025 100644 --- a/lib/pages/danmaku_block/index.dart +++ b/lib/pages/danmaku_block/index.dart @@ -19,7 +19,7 @@ class _DanmakuBlockPageState extends State { final DanmakuBlockController _danmakuBlockController = Get.put(DanmakuBlockController()); final ScrollController scrollController = ScrollController(); - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late PlPlayerController plPlayerController; static const Map ruleLabels = { diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 10341463..13c2783f 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -30,11 +30,11 @@ class DynamicsController extends GetxController late List tabsPageList; bool flag = false; RxInt initialValue = 0.obs; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; RxBool userLogin = false.obs; var userInfo; RxBool isLoadingDynamic = false.obs; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; @override void onInit() { diff --git a/lib/pages/dynamics/detail/controller.dart b/lib/pages/dynamics/detail/controller.dart index 9d4a7192..7b8c9089 100644 --- a/lib/pages/dynamics/detail/controller.dart +++ b/lib/pages/dynamics/detail/controller.dart @@ -24,7 +24,7 @@ class DynamicDetailController extends GetxController { ReplySortType _sortType = ReplySortType.time; RxString sortTypeTitle = ReplySortType.time.titles.obs; RxString sortTypeLabel = ReplySortType.time.labels.obs; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; @override void onInit() { diff --git a/lib/pages/dynamics/tab/controller.dart b/lib/pages/dynamics/tab/controller.dart index cf5917bc..607a3b42 100644 --- a/lib/pages/dynamics/tab/controller.dart +++ b/lib/pages/dynamics/tab/controller.dart @@ -13,7 +13,7 @@ class DynamicsTabController extends GetxController { RxList dynamicsList = [].obs; RxBool isLoadingMore = false.obs; String dynamicsType = 'all'; - // Box userInfoCache = GStrorage.userInfo; + // Box userInfoCache = GStorage.userInfo; // bool userLogin = false; int mid = -1; diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics/tab/view.dart index ff767006..94531929 100644 --- a/lib/pages/dynamics/tab/view.dart +++ b/lib/pages/dynamics/tab/view.dart @@ -68,7 +68,7 @@ class _DynamicsTabPageState extends State _futureBuilderFuture = _dynamicsTabController.queryFollowDynamic( 'init', widget.dynamicsType, mid); }); - dynamicsWaterfallFlow = GStrorage.setting + dynamicsWaterfallFlow = GStorage.setting .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true); } @@ -87,7 +87,7 @@ class _DynamicsTabPageState extends State // key: // ValueKey(widget.dynamicsType + widget.mid.value.toString()), onRefresh: () async { - dynamicsWaterfallFlow = GStrorage.setting + dynamicsWaterfallFlow = GStorage.setting .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true); await Future.wait([ _dynamicsTabController.onRefresh(), diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index bedf2060..001d6535 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -24,7 +24,7 @@ class _DynamicsPageState extends State with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin { final DynamicsController _dynamicsController = Get.put(DynamicsController()); late Future _futureBuilderFutureUp; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; late ScrollController scrollController; late UpPanelPosition upPanelPosition; diff --git a/lib/pages/dynamics/widgets/content_panel.dart b/lib/pages/dynamics/widgets/content_panel.dart index 782a407e..107d0032 100644 --- a/lib/pages/dynamics/widgets/content_panel.dart +++ b/lib/pages/dynamics/widgets/content_panel.dart @@ -38,7 +38,7 @@ class _ContentState extends State { } InlineSpan picsNodes() { - List spanChilds = []; + List spanChildren = []; int len = pics.length; List picList = []; @@ -47,8 +47,8 @@ class _ContentState extends State { picList.add(pictureItem.url!); /// 图片上方的空白间隔 - // spanChilds.add(const TextSpan(text: '\n')); - spanChilds.add( + // spanChildren.add(const TextSpan(text: '\n')); + spanChildren.add( WidgetSpan( child: LayoutBuilder( builder: (context, BoxConstraints box) { @@ -132,7 +132,7 @@ class _ContentState extends State { ), ); } - spanChilds.add( + spanChildren.add( WidgetSpan( child: LayoutBuilder( builder: (context, BoxConstraints box) { @@ -163,7 +163,7 @@ class _ContentState extends State { ); } return TextSpan( - children: spanChilds, + children: spanChildren, ); } diff --git a/lib/pages/dynamics/widgets/rich_node_panel.dart b/lib/pages/dynamics/widgets/rich_node_panel.dart index d245a784..7d5082ef 100644 --- a/lib/pages/dynamics/widgets/rich_node_panel.dart +++ b/lib/pages/dynamics/widgets/rich_node_panel.dart @@ -10,7 +10,7 @@ InlineSpan richNode(item, context) { try { TextStyle authorStyle = TextStyle(color: Theme.of(context).colorScheme.primary); - List spanChilds = []; + List spanChildren = []; dynamic richTextNodes; if (item.modules.moduleDynamic.desc != null) { @@ -20,7 +20,7 @@ InlineSpan richNode(item, context) { richTextNodes = item.modules.moduleDynamic.major.opus.summary.richTextNodes; if (item.modules.moduleDynamic.major.opus.title != null) { - spanChilds.add( + spanChildren.add( TextSpan( text: item.modules.moduleDynamic.major.opus.title + '\n', style: Theme.of(context) @@ -39,12 +39,12 @@ InlineSpan richNode(item, context) { // if (item.modules.moduleDynamic.major.opus.title == null && // i.type == 'RICH_TEXT_NODE_TYPE_TEXT') { if (i.type == 'RICH_TEXT_NODE_TYPE_TEXT') { - spanChilds.add( + spanChildren.add( TextSpan(text: i.origText, style: const TextStyle(height: 1.65))); } // @用户 if (i.type == 'RICH_TEXT_NODE_TYPE_AT') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: Row( @@ -65,7 +65,7 @@ InlineSpan richNode(item, context) { } // 话题 if (i.type == 'RICH_TEXT_NODE_TYPE_TOPIC') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( @@ -80,7 +80,7 @@ InlineSpan richNode(item, context) { } // 网页链接 if (i.type == 'RICH_TEXT_NODE_TYPE_WEB') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: Icon( @@ -90,7 +90,7 @@ InlineSpan richNode(item, context) { ), ), ); - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( @@ -114,7 +114,7 @@ InlineSpan richNode(item, context) { } // 投票 if (i.type == 'RICH_TEXT_NODE_TYPE_VOTE') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( @@ -142,7 +142,7 @@ InlineSpan richNode(item, context) { } // 表情 if (i.type == 'RICH_TEXT_NODE_TYPE_EMOJI') { - spanChilds.add( + spanChildren.add( WidgetSpan( child: NetworkImgLayer( src: i.emoji.iconUrl, @@ -155,7 +155,7 @@ InlineSpan richNode(item, context) { } // 抽奖 if (i.type == 'RICH_TEXT_NODE_TYPE_LOTTERY') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: Icon( @@ -165,7 +165,7 @@ InlineSpan richNode(item, context) { ), ), ); - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( @@ -181,7 +181,7 @@ InlineSpan richNode(item, context) { /// TODO 商品 if (i.type == 'RICH_TEXT_NODE_TYPE_GOODS') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: Icon( @@ -191,7 +191,7 @@ InlineSpan richNode(item, context) { ), ), ); - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( @@ -206,7 +206,7 @@ InlineSpan richNode(item, context) { } // 投稿 if (i.type == 'RICH_TEXT_NODE_TYPE_BV') { - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: Icon( @@ -216,7 +216,7 @@ InlineSpan richNode(item, context) { ), ), ); - spanChilds.add( + spanChildren.add( WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( @@ -248,8 +248,8 @@ InlineSpan richNode(item, context) { // if (len == 1) { // OpusPicsModel pictureItem = pics.first; // picList.add(pictureItem.url!); - // spanChilds.add(const TextSpan(text: '\n')); - // spanChilds.add( + // spanChildren.add(const TextSpan(text: '\n')); + // spanChildren.add( // WidgetSpan( // child: LayoutBuilder( // builder: (context, BoxConstraints box) { @@ -309,7 +309,7 @@ InlineSpan richNode(item, context) { // ), // ); // } - // spanChilds.add( + // spanChildren.add( // WidgetSpan( // child: LayoutBuilder( // builder: (context, BoxConstraints box) { @@ -339,7 +339,7 @@ InlineSpan richNode(item, context) { // ), // ); // } - // spanChilds.add( + // spanChildren.add( // WidgetSpan( // child: NetworkImgLayer( // src: pics.first.url, @@ -351,7 +351,7 @@ InlineSpan richNode(item, context) { // ); // } return TextSpan( - children: spanChilds, + children: spanChildren, ); } } catch (err) { diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index 9fba01c4..1b1e26db 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -22,7 +22,7 @@ class _UpPanelState extends State { int currentMid = -1; List upList = []; List liveList = []; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; var userInfo; bool _showLiveItems = false; late DynamicsController dynamicsController; diff --git a/lib/pages/fan/controller.dart b/lib/pages/fan/controller.dart index ccaec270..144fe7bb 100644 --- a/lib/pages/fan/controller.dart +++ b/lib/pages/fan/controller.dart @@ -6,7 +6,7 @@ import 'package:PiliPalaX/models/fans/result.dart'; import 'package:PiliPalaX/utils/storage.dart'; class FansController extends GetxController { - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; int pn = 1; int ps = 20; int total = 0; diff --git a/lib/pages/fav/controller.dart b/lib/pages/fav/controller.dart index 1142c8cd..dd99fe27 100644 --- a/lib/pages/fav/controller.dart +++ b/lib/pages/fav/controller.dart @@ -10,7 +10,7 @@ import 'package:PiliPalaX/utils/storage.dart'; class FavController extends GetxController { final ScrollController scrollController = ScrollController(); Rx favFolderData = FavFolderData().obs; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; UserInfoData? userInfo; int currentPage = 1; int pageSize = 10; diff --git a/lib/pages/follow/controller.dart b/lib/pages/follow/controller.dart index 953fae26..d5fb5e91 100644 --- a/lib/pages/follow/controller.dart +++ b/lib/pages/follow/controller.dart @@ -11,7 +11,7 @@ import 'package:PiliPalaX/utils/storage.dart'; /// 查看自己的关注时，可以查看分类 /// 查看其他人的关注时，只可以看全部 class FollowController extends GetxController with GetTickerProviderStateMixin { - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; int pn = 1; int ps = 20; int total = 0; diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart index 55dacc79..ec462512 100644 --- a/lib/pages/history/controller.dart +++ b/lib/pages/history/controller.dart @@ -11,7 +11,7 @@ class HistoryController extends GetxController { RxList historyList = [].obs; RxBool isLoadingMore = false.obs; RxBool pauseStatus = false.obs; - Box localCache = GStrorage.localCache; + Box localCache = GStorage.localCache; RxBool isLoading = false.obs; RxBool enableMultiple = false.obs; RxInt checkedCount = 0.obs; diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index a5956774..958e2e9c 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -14,12 +14,12 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { late TabController tabController; late List tabsCtrList; late List tabsPageList; - Box userInfoCache = GStrorage.userInfo; - Box settingStorage = GStrorage.setting; + Box userInfoCache = GStorage.userInfo; + Box settingStorage = GStorage.setting; RxBool userLogin = false.obs; RxString userFace = ''.obs; var userInfo; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late final StreamController searchBarStream = StreamController.broadcast(); late bool hideSearchBar; diff --git a/lib/pages/home/widgets/app_bar.dart b/lib/pages/home/widgets/app_bar.dart index 7a8ee2d9..28a5724f 100644 --- a/lib/pages/home/widgets/app_bar.dart +++ b/lib/pages/home/widgets/app_bar.dart @@ -6,7 +6,7 @@ import 'package:PiliPalaX/common/widgets/network_img_layer.dart'; import 'package:PiliPalaX/pages/mine/view.dart'; import 'package:PiliPalaX/utils/storage.dart'; -Box userInfoCache = GStrorage.userInfo; +Box userInfoCache = GStorage.userInfo; class HomeAppBar extends StatelessWidget { const HomeAppBar({super.key}); diff --git a/lib/pages/html/controller.dart b/lib/pages/html/controller.dart index 2761fb48..96ee1325 100644 --- a/lib/pages/html/controller.dart +++ b/lib/pages/html/controller.dart @@ -25,7 +25,7 @@ class HtmlRenderController extends GetxController { late ReplySortType _sortType; late RxString sortTypeTitle; late RxString sortTypeLabel; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; @override void onInit() { diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart index d03dfa7a..9332e659 100644 --- a/lib/pages/live/controller.dart +++ b/lib/pages/live/controller.dart @@ -13,7 +13,7 @@ class LiveController extends GetxController { RxList liveList = [].obs; bool flag = false; OverlayEntry? popupDialog; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; @override void onInit() { diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 7a477cc3..77739a04 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -72,7 +72,7 @@ class LiveRoomController extends GetxController { } } - void setVolumn(value) { + void setVolume(value) { if (value == 0) { // 设置音量 volumeOff.value = false; diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart index 4d71bac9..6d00ea90 100644 --- a/lib/pages/live_room/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -33,7 +33,7 @@ class _BottomControlState extends State { TextStyle subTitleStyle = const TextStyle(fontSize: 12); TextStyle titleStyle = const TextStyle(fontSize: 14); Size get preferredSize => const Size(double.infinity, kToolbarHeight); - Box localCache = GStrorage.localCache; + Box localCache = GStorage.localCache; @override void initState() { diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index b856e285..d195de16 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -26,12 +26,12 @@ class MainController extends GetxController { RxList navigationBars = defaultNavigationBars.obs; final StreamController bottomBarStream = StreamController.broadcast(); - Box setting = GStrorage.setting; + Box setting = GStorage.setting; DateTime? _lastPressedAt; late bool hideTabBar; late PageController pageController; int selectedIndex = 0; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; RxBool userLogin = false.obs; late DynamicBadgeMode dynamicBadgeType; diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index c841ef9c..7b217f88 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -27,7 +27,7 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { final MediaController _mediaController = Get.put(MediaController()); int? _lastSelectTime; //上次点击时间 - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late bool enableMYBar; late bool useSideBar; late bool enableGradientBg; @@ -101,7 +101,7 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { @override void dispose() async { - await GStrorage.close(); + await GStorage.close(); EventBus().off(EventName.loginEvent); super.dispose(); } diff --git a/lib/pages/media/controller.dart b/lib/pages/media/controller.dart index 85605e69..f9c378f4 100644 --- a/lib/pages/media/controller.dart +++ b/lib/pages/media/controller.dart @@ -8,7 +8,7 @@ import 'package:PiliPalaX/utils/storage.dart'; class MediaController extends GetxController { Rx favFolderData = FavFolderData().obs; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; RxBool userLogin = false.obs; List list = [ { @@ -61,7 +61,7 @@ class MediaController extends GetxController { var res = await await UserHttp.userfavFolder( pn: 1, ps: 5, - mid: mid ?? GStrorage.userInfo.get('userInfoCache').mid, + mid: mid ?? GStorage.userInfo.get('userInfoCache').mid, ); favFolderData.value = res['data']; return res; diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart index 93b8a783..488de8d7 100644 --- a/lib/pages/member/controller.dart +++ b/lib/pages/member/controller.dart @@ -20,7 +20,7 @@ class MemberController extends GetxController { late Map userStat; RxString face = ''.obs; String? heroTag; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; late int ownerMid; bool specialFollowed = false; // 投稿列表 diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart index d3eb12e4..72fcf347 100644 --- a/lib/pages/member/view.dart +++ b/lib/pages/member/view.dart @@ -215,7 +215,7 @@ class _MemberPageState extends State if (snapshot.data['status']) { Map data = snapshot.data as Map; if (data['data'].seasonsList.isEmpty) { - return commenWidget('用户没有设置专栏'); + return commonWidget('用户没有设置专栏'); } else { return MemberSeasonsPanel(data: data['data']); } @@ -450,7 +450,7 @@ class _MemberPageState extends State ); } - Widget commenWidget(msg) { + Widget commonWidget(msg) { return Padding( padding: const EdgeInsets.only( top: 20, diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart index 246a61d6..a75e2566 100644 --- a/lib/pages/member_dynamics/view.dart +++ b/lib/pages/member_dynamics/view.dart @@ -46,7 +46,7 @@ class _MemberDynamicsPageState extends State { } }, ); - dynamicsWaterfallFlow = GStrorage.setting + dynamicsWaterfallFlow = GStorage.setting .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true); } diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart index f61397a4..7ee3c28e 100644 --- a/lib/pages/mine/controller.dart +++ b/lib/pages/mine/controller.dart @@ -14,11 +14,11 @@ class MineController extends GetxController { // 用户状态 动态、关注、粉丝 Rx userStat = UserStat().obs; RxBool userLogin = false.obs; - Box userInfoCache = GStrorage.userInfo; - Box setting = GStrorage.setting; + Box userInfoCache = GStorage.userInfo; + Box setting = GStorage.setting; Rx themeType = ThemeType.system.obs; static bool anonymity = - GStrorage.setting.get(SettingBoxKey.anonymity, defaultValue: false); + GStorage.setting.get(SettingBoxKey.anonymity, defaultValue: false); @override onInit() { @@ -131,7 +131,7 @@ class MineController extends GetxController { TextButton( onPressed: () { SmartDialog.dismiss(); - GStrorage.setting + GStorage.setting .put(SettingBoxKey.anonymity, true); anonymity = true; SmartDialog.showToast('已设为永久无痕模式'); @@ -146,7 +146,7 @@ class MineController extends GetxController { TextButton( onPressed: () { SmartDialog.dismiss(); - GStrorage.setting + GStorage.setting .put(SettingBoxKey.anonymity, false); anonymity = true; SmartDialog.showToast('已设为临时无痕模式'); @@ -164,7 +164,7 @@ class MineController extends GetxController { ); }); } else { - GStrorage.setting.put(SettingBoxKey.anonymity, false); + GStorage.setting.put(SettingBoxKey.anonymity, false); SmartDialog.show( clickMaskDismiss: false, usePenetrate: true, diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index ef3c0694..fd434577 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -11,7 +11,7 @@ class RankController extends GetxController with GetTickerProviderStateMixin { late TabController tabController; late List tabsCtrList; late List tabsPageList; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; // late final StreamController searchBarStream = // StreamController.broadcast(); late bool enableGradientBg; diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart index 2a93e636..71160371 100644 --- a/lib/pages/rcmd/controller.dart +++ b/lib/pages/rcmd/controller.dart @@ -13,7 +13,7 @@ class RcmdController extends GetxController { // RxList webVideoList = [].obs; bool isLoadingMore = true; OverlayEntry? popupDialog; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; RxInt crossAxisCount = 2.obs; late bool enableSaveLastData; late String defaultRcmdType = 'web'; diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index 5dc9c1f7..9215c20e 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -12,7 +12,7 @@ class SSearchController extends GetxController { RxString searchKeyWord = ''.obs; Rx controller = TextEditingController().obs; RxList hotSearchList = [].obs; - Box historyWord = GStrorage.historyword; + Box historyWord = GStorage.historyWord; List historyCacheList = []; RxList historyList = [].obs; RxList searchSuggestList = [].obs; @@ -20,7 +20,7 @@ class SSearchController extends GetxController { Debouncer(delay: const Duration(milliseconds: 200)); // 设置延迟时间 String hintText = '搜索'; RxString defaultSearch = ''.obs; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; bool enableHotKey = true; @override diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index ca1ceef5..a9fea647 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -91,7 +91,7 @@ class _SearchPanelState extends State list: list.value, ); case SearchType.media_bangumi: - return searchMbangumiPanel(context, ctr, list); + return searchBangumiPanel(context, ctr, list); case SearchType.bili_user: return searchUserPanel(context, ctr, list); case SearchType.live_room: diff --git a/lib/pages/search_panel/widgets/media_bangumi_panel.dart b/lib/pages/search_panel/widgets/media_bangumi_panel.dart index 53cd19a3..a5194676 100644 --- a/lib/pages/search_panel/widgets/media_bangumi_panel.dart +++ b/lib/pages/search_panel/widgets/media_bangumi_panel.dart @@ -11,7 +11,7 @@ import 'package:PiliPalaX/utils/utils.dart'; import '../../../utils/grid.dart'; -Widget searchMbangumiPanel(BuildContext context, ctr, list) { +Widget searchBangumiPanel(BuildContext context, ctr, list) { TextStyle style = TextStyle(fontSize: Theme.of(context).textTheme.labelMedium!.fontSize); return CustomScrollView( diff --git a/lib/pages/setting/controller.dart b/lib/pages/setting/controller.dart index 6e868f4b..3594ce4e 100644 --- a/lib/pages/setting/controller.dart +++ b/lib/pages/setting/controller.dart @@ -13,9 +13,9 @@ import '../main/index.dart'; import 'widgets/select_dialog.dart'; class SettingController extends GetxController { - Box userInfoCache = GStrorage.userInfo; - Box setting = GStrorage.setting; - Box localCache = GStrorage.localCache; + Box userInfoCache = GStorage.userInfo; + Box setting = GStorage.setting; + Box localCache = GStorage.localCache; RxBool userLogin = false.obs; RxBool hiddenSettingUnlocked = false.obs; @@ -117,7 +117,7 @@ class SettingController extends GetxController { } // 设置默认启动页 - seteDefaultHomePage(BuildContext context) async { + setDefaultHomePage(BuildContext context) async { int? result = await showDialog( context: context, builder: (context) { diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart index 01ab67a2..fd721be1 100644 --- a/lib/pages/setting/extra_setting.dart +++ b/lib/pages/setting/extra_setting.dart @@ -19,7 +19,7 @@ class ExtraSetting extends StatefulWidget { } class _ExtraSettingState extends State { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; final SettingController settingController = Get.put(SettingController()); late dynamic defaultReplySort; late dynamic defaultDynamicType; diff --git a/lib/pages/setting/pages/color_select.dart b/lib/pages/setting/pages/color_select.dart index 20c12c9a..6cc17cf1 100644 --- a/lib/pages/setting/pages/color_select.dart +++ b/lib/pages/setting/pages/color_select.dart @@ -142,7 +142,7 @@ class _ColorSelectPageState extends State { } class ColorSelectController extends GetxController { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; RxBool dynamicColor = true.obs; RxInt type = 0.obs; late final List> colorThemes; diff --git a/lib/pages/setting/pages/display_mode.dart b/lib/pages/setting/pages/display_mode.dart index 0d10c475..3dafdca7 100644 --- a/lib/pages/setting/pages/display_mode.dart +++ b/lib/pages/setting/pages/display_mode.dart @@ -5,18 +5,18 @@ import 'package:flutter_displaymode/flutter_displaymode.dart'; import 'package:hive/hive.dart'; import 'package:PiliPalaX/utils/storage.dart'; -class SetDiaplayMode extends StatefulWidget { - const SetDiaplayMode({super.key}); +class SetDisplayMode extends StatefulWidget { + const SetDisplayMode({super.key}); @override - State createState() => _SetDiaplayModeState(); + State createState() => _SetDisplayModeState(); } -class _SetDiaplayModeState extends State { +class _SetDisplayModeState extends State { List modes = []; DisplayMode? active; DisplayMode? preferred; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; final ValueNotifier page = ValueNotifier(0); late final PageController controller = PageController() diff --git a/lib/pages/setting/pages/font_size_select.dart b/lib/pages/setting/pages/font_size_select.dart index 31e53193..123208ae 100644 --- a/lib/pages/setting/pages/font_size_select.dart +++ b/lib/pages/setting/pages/font_size_select.dart @@ -11,17 +11,17 @@ class FontSizeSelectPage extends StatefulWidget { } class _FontSizeSelectPageState extends State { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; List list = List.generate(12, (index) => 0.85 + index * 0.05); //[0.85, 0.9, 0.95, 1.0, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35]; - late double minsize; + late double minSize; late double maxSize; late double currentSize; @override void initState() { super.initState(); - minsize = list.first; + minSize = list.first; maxSize = list.last; currentSize = setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0); @@ -74,7 +74,7 @@ class _FontSizeSelectPageState extends State { const Text('小'), Expanded( child: Slider( - min: minsize, + min: minSize, value: currentSize, max: maxSize, divisions: list.length - 1, diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart index df5f5193..230d2bb9 100644 --- a/lib/pages/setting/pages/home_tabbar_set.dart +++ b/lib/pages/setting/pages/home_tabbar_set.dart @@ -12,7 +12,7 @@ class TabbarSetPage extends StatefulWidget { } class _TabbarSetPageState extends State { - Box settingStorage = GStrorage.setting; + Box settingStorage = GStorage.setting; late List defaultTabs; late List tabbarSort; diff --git a/lib/pages/setting/pages/play_speed_set.dart b/lib/pages/setting/pages/play_speed_set.dart index 317dcf2d..18749c1d 100644 --- a/lib/pages/setting/pages/play_speed_set.dart +++ b/lib/pages/setting/pages/play_speed_set.dart @@ -15,8 +15,8 @@ class PlaySpeedPage extends StatefulWidget { } class _PlaySpeedPageState extends State { - Box videoStorage = GStrorage.video; - Box settingStorage = GStrorage.setting; + Box videoStorage = GStorage.video; + Box settingStorage = GStorage.setting; late double playSpeedDefault; late double longPressSpeedDefault; late List customSpeedsList; diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart index f95fa845..a5fccb59 100644 --- a/lib/pages/setting/play_setting.dart +++ b/lib/pages/setting/play_setting.dart @@ -20,7 +20,7 @@ class PlaySetting extends StatefulWidget { } class _PlaySettingState extends State { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late String defaultSubtitlePreference; late int defaultFullScreenMode; late int defaultBtmProgressBehavior; @@ -31,7 +31,7 @@ class _PlaySettingState extends State { defaultFullScreenMode = setting.get(SettingBoxKey.fullScreenMode, defaultValue: FullScreenMode.values.first.code); defaultBtmProgressBehavior = setting.get(SettingBoxKey.btmProgressBehavior, - defaultValue: BtmProgresBehavior.values.first.code); + defaultValue: BtmProgressBehavior.values.first.code); defaultSubtitlePreference = setting.get(SettingBoxKey.subtitlePreference, defaultValue: SubtitlePreference.values.first.code); } @@ -231,7 +231,7 @@ class _PlaySettingState extends State { return SelectDialog( title: '底部进度条展示', value: defaultBtmProgressBehavior, - values: BtmProgresBehavior.values.map((e) { + values: BtmProgressBehavior.values.map((e) { return {'title': e.description, 'value': e.code}; }).toList()); }, diff --git a/lib/pages/setting/privacy_setting.dart b/lib/pages/setting/privacy_setting.dart index 6d47a0b7..66c3dc12 100644 --- a/lib/pages/setting/privacy_setting.dart +++ b/lib/pages/setting/privacy_setting.dart @@ -24,7 +24,7 @@ class PrivacySetting extends StatefulWidget { class _PrivacySettingState extends State { bool userLogin = false; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; UserInfoData? userInfo; late bool hiddenSettingUnlocked; @@ -33,7 +33,7 @@ class _PrivacySettingState extends State { super.initState(); userInfo = userInfoCache.get('userInfoCache'); userLogin = userInfo != null; - hiddenSettingUnlocked = GStrorage.setting + hiddenSettingUnlocked = GStorage.setting .get(SettingBoxKey.hiddenSettingUnlocked, defaultValue: false); } @@ -256,9 +256,9 @@ class _PrivacySettingState extends State { if (result['status'] && result['data'].isLogin) { SmartDialog.showToast('登录成功，当前采用「' - '${GStrorage.setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web')}' + '${GStorage.setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web')}' '端」推荐'); - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; await userInfoCache.put( 'userInfoCache', result['data']); final HomeController homeCtr = diff --git a/lib/pages/setting/recommend_setting.dart b/lib/pages/setting/recommend_setting.dart index 3a8cec61..6db53f39 100644 --- a/lib/pages/setting/recommend_setting.dart +++ b/lib/pages/setting/recommend_setting.dart @@ -18,10 +18,10 @@ class RecommendSetting extends StatefulWidget { } class _RecommendSettingState extends State { - Box setting = GStrorage.setting; - static Box localCache = GStrorage.localCache; + Box setting = GStorage.setting; + static Box localCache = GStorage.localCache; late dynamic defaultRcmdType; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; late dynamic userInfo; bool userLogin = false; late dynamic accessKeyInfo; diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index c7b767ee..face4690 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -31,7 +31,7 @@ class _StyleSettingState extends State { final ColorSelectController colorSelectController = Get.put(ColorSelectController()); - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late int picQuality; late ThemeType _tempThemeValue; late double maxRowWidth; @@ -343,7 +343,7 @@ class _StyleSettingState extends State { ), ListTile( dense: false, - onTap: () => settingController.seteDefaultHomePage(context), + onTap: () => settingController.setDefaultHomePage(context), leading: const Icon(Icons.home_outlined), title: Text('默认启动页', style: titleStyle), subtitle: Obx(() => Text( diff --git a/lib/pages/setting/video_setting.dart b/lib/pages/setting/video_setting.dart index 50ea221f..e7d8f58b 100644 --- a/lib/pages/setting/video_setting.dart +++ b/lib/pages/setting/video_setting.dart @@ -16,7 +16,7 @@ class VideoSetting extends StatefulWidget { } class _VideoSettingState extends State { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late dynamic defaultVideoQa; late dynamic defaultAudioQa; late dynamic defaultDecode; diff --git a/lib/pages/setting/widgets/select_item.dart b/lib/pages/setting/widgets/select_item.dart index cbe780e3..2218d8c0 100644 --- a/lib/pages/setting/widgets/select_item.dart +++ b/lib/pages/setting/widgets/select_item.dart @@ -19,7 +19,7 @@ class SetSelectItem extends StatefulWidget { } class _SetSelectItemState extends State { - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late dynamic currentVal; late int currentIndex; late List menus; diff --git a/lib/pages/setting/widgets/switch_item.dart b/lib/pages/setting/widgets/switch_item.dart index e32970f6..618de131 100644 --- a/lib/pages/setting/widgets/switch_item.dart +++ b/lib/pages/setting/widgets/switch_item.dart @@ -30,7 +30,7 @@ class SetSwitchItem extends StatefulWidget { class _SetSwitchItemState extends State { // ignore: non_constant_identifier_names - Box Setting = GStrorage.setting; + Box Setting = GStorage.setting; late bool val; @override diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart index 8731f36c..4d228dd9 100644 --- a/lib/pages/subscription/controller.dart +++ b/lib/pages/subscription/controller.dart @@ -11,7 +11,7 @@ import '../../models/user/sub_folder.dart'; class SubController extends GetxController { final ScrollController scrollController = ScrollController(); Rx subFolderData = SubFolderModelData().obs; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; UserInfoData? userInfo; int currentPage = 1; int pageSize = 20; diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 9f3fd369..073b3cd6 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -59,9 +59,9 @@ class VideoDetailController extends GetxController RxString hwdec = 'auto-safe'.obs; /// 本地存储 - Box userInfoCache = GStrorage.userInfo; - Box localCache = GStrorage.localCache; - Box setting = GStrorage.setting; + Box userInfoCache = GStorage.userInfo; + Box localCache = GStorage.localCache; + Box setting = GStorage.setting; RxInt oid = 0.obs; // 评论id 请求楼中楼评论使用 diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 706c4165..d664c325 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -51,7 +51,7 @@ class VideoIntroController extends GetxController { RxBool hasCoin = false.obs; // 是否收藏 RxBool hasFav = false.obs; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; bool userLogin = false; Rx favFolderData = FavFolderData().obs; List addMediaIdsNew = []; @@ -461,15 +461,15 @@ class VideoIntroController extends GetxController { // 重新获取视频资源 final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); - final ReleatedController releatedCtr = - Get.find(tag: heroTag); + final RelatedController relatedCtr = + Get.find(tag: heroTag); videoDetailCtr.bvid = bvid; videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid); videoDetailCtr.cid.value = cid; videoDetailCtr.danmakuCid.value = cid; videoDetailCtr.queryVideoUrl(); - releatedCtr.bvid = bvid; - releatedCtr.queryRelatedVideo(); + relatedCtr.bvid = bvid; + relatedCtr.queryRelatedVideo(); // 重新请求评论 try { /// 未渲染回复组件时可能异常 diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index f54eafa1..5dc9360e 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -128,7 +128,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { late final VideoDetailController videoDetailCtr; late final Map videoItem; - final Box setting = GStrorage.setting; + final Box setting = GStorage.setting; late final bool loadingStatus; // 加载状态 diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index 98696b44..61d58207 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -118,7 +118,7 @@ class IntroDetail extends StatelessWidget { // type // 1 普通文本 // 2 @用户 - final List spanChilds = List.generate(descV2.length, (index) { + final List spanChildren = List.generate(descV2.length, (index) { final currentDesc = descV2[index]; switch (currentDesc.type) { case 1: @@ -186,6 +186,6 @@ class IntroDetail extends StatelessWidget { return const TextSpan(); } }); - return TextSpan(children: spanChilds); + return TextSpan(children: spanChildren); } } diff --git a/lib/pages/video/detail/related/controller.dart b/lib/pages/video/detail/related/controller.dart index 5bc3e061..a48250dc 100644 --- a/lib/pages/video/detail/related/controller.dart +++ b/lib/pages/video/detail/related/controller.dart @@ -3,7 +3,7 @@ import 'package:get/get.dart'; import 'package:PiliPalaX/http/video.dart'; import '../../../../models/model_hot_video_item.dart'; -class ReleatedController extends GetxController { +class RelatedController extends GetxController { // 视频aid String bvid = Get.parameters['bvid'] ?? ""; // 推荐视频列表 diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart index 822ad0bf..770370c4 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/detail/related/view.dart @@ -18,7 +18,7 @@ class RelatedVideoPanel extends StatefulWidget { class _RelatedVideoPanelState extends State with AutomaticKeepAliveClientMixin { - late ReleatedController _releatedController; + late RelatedController _relatedController; late Future _futureBuilder; @override @@ -27,8 +27,8 @@ class _RelatedVideoPanelState extends State @override void initState() { super.initState(); - _releatedController = Get.put(ReleatedController(), tag: widget.heroTag); - _futureBuilder = _releatedController.queryRelatedVideo(); + _relatedController = Get.put(RelatedController(), tag: widget.heroTag); + _futureBuilder = _relatedController.queryRelatedVideo(); } @override @@ -44,7 +44,7 @@ class _RelatedVideoPanelState extends State return const SliverToBoxAdapter(child: SizedBox()); } if (snapshot.data!['status'] && snapshot.hasData) { - RxList relatedVideoList = _releatedController.relatedVideoList; + RxList relatedVideoList = _relatedController.relatedVideoList; // 请求成功 return Obx( () => SliverGrid( @@ -65,17 +65,17 @@ class _RelatedVideoPanelState extends State showPubdate: true, longPress: () { try { - _releatedController.popupDialog = - _createPopupDialog(_releatedController + _relatedController.popupDialog = + _createPopupDialog(_relatedController .relatedVideoList[index]); Overlay.of(context) - .insert(_releatedController.popupDialog!); + .insert(_relatedController.popupDialog!); } catch (err) { return {}; } }, longPressEnd: () { - _releatedController.popupDialog?.remove(); + _relatedController.popupDialog?.remove(); }, ), ); @@ -108,10 +108,10 @@ class _RelatedVideoPanelState extends State OverlayEntry _createPopupDialog(videoItem) { return OverlayEntry( builder: (BuildContext context) => AnimatedDialog( - closeFn: _releatedController.popupDialog?.remove, + closeFn: _relatedController.popupDialog?.remove, child: OverlayPop( videoItem: videoItem, - closeFn: _releatedController.popupDialog?.remove), + closeFn: _relatedController.popupDialog?.remove), ), ); } diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 0440206e..6d2b34c5 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -36,7 +36,7 @@ class VideoReplyController extends GetxController { RxString sortTypeTitle = ReplySortType.time.titles.obs; RxString sortTypeLabel = ReplySortType.time.labels.obs; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; @override void onInit() { diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 7d53d005..30d3faf5 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -20,7 +20,7 @@ import 'package:PiliPalaX/utils/utils.dart'; import '../../../../../utils/app_scheme.dart'; import 'zan.dart'; -Box setting = GStrorage.setting; +Box setting = GStorage.setting; class ReplyItem extends StatelessWidget { const ReplyItem({ @@ -268,7 +268,7 @@ class ReplyItem extends StatelessWidget { )), ), // 操作区域 - bottonAction(context, replyItem!.replyControl), + buttonAction(context, replyItem!.replyControl), // 一楼的评论 if ((replyItem!.replyControl!.isShow! || replyItem!.replies!.isNotEmpty) && @@ -289,7 +289,7 @@ class ReplyItem extends StatelessWidget { } // 感谢、回复、复制 - Widget bottonAction(BuildContext context, replyControl) { + Widget buttonAction(BuildContext context, replyControl) { return Row( children: [ const SizedBox(width: 32), @@ -528,14 +528,14 @@ InlineSpan buildContent( // replyReply 查看二楼回复（回复详情）回调 // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示 final content = replyItem.content; - final List spanChilds = []; + final List spanChildren = []; // 投票 if (content.vote.isNotEmpty) { content.message.splitMapJoin(RegExp(r"\{vote:.*?\}"), onMatch: (Match match) { // String matchStr = match[0]!; - spanChilds.add( + spanChildren.add( TextSpan( text: '投票: ${content.vote['title']}', style: TextStyle( @@ -587,7 +587,7 @@ InlineSpan buildContent( final RegExp pattern = RegExp(patternStr); List matchedStrs = []; void addPlainTextSpan(str) { - spanChilds.add(TextSpan( + spanChildren.add(TextSpan( text: str, )); // TextSpan( @@ -606,7 +606,7 @@ InlineSpan buildContent( if (content.emote.containsKey(matchStr)) { // 处理表情 final int size = content.emote[matchStr]['meta']['size']; - spanChilds.add(WidgetSpan( + spanChildren.add(WidgetSpan( child: ExcludeSemantics( child: NetworkImgLayer( src: content.emote[matchStr]['url'], @@ -621,7 +621,7 @@ InlineSpan buildContent( // 处理@用户 final String userName = matchStr.substring(1); final int userId = content.atNameToMid[userName]; - spanChilds.add( + spanChildren.add( TextSpan( text: matchStr, style: TextStyle( @@ -640,7 +640,7 @@ InlineSpan buildContent( } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$') .hasMatch(matchStr)) { matchStr = matchStr.replaceAll('：', ':'); - spanChilds.add( + spanChildren.add( TextSpan( text: ' $matchStr ', style: isVideoPage @@ -677,7 +677,7 @@ InlineSpan buildContent( addPlainTextSpan(matchStr); return ""; } - spanChilds.addAll( + spanChildren.addAll( [ if (content.jumpUrl[matchStr]?['prefix_icon'] != null) ...[ WidgetSpan( @@ -721,7 +721,7 @@ InlineSpan buildContent( source: '', dataString: redirectUrl, ); - PiliSchame.routePush(scheme); + PiliScheme.routePush(scheme); // final String pathSegment = Uri.parse(redirectUrl).path; // final String lastPathSegment = // pathSegment.split('/').last; @@ -788,7 +788,7 @@ InlineSpan buildContent( } else if (content .topicsMeta[matchStr.substring(1, matchStr.length - 1)] != null) { - spanChilds.add( + spanChildren.add( TextSpan( text: matchStr, style: TextStyle( @@ -822,7 +822,7 @@ InlineSpan buildContent( if (unmatchedItems.isNotEmpty) { for (int i = 0; i < unmatchedItems.length; i++) { String patternStr = unmatchedItems[i]; - spanChilds.addAll( + spanChildren.addAll( [ if (content.jumpUrl[patternStr]?['prefix_icon'] != null) ...[ WidgetSpan( @@ -859,11 +859,11 @@ InlineSpan buildContent( if (content.pictures.isNotEmpty) { final List picList = []; final int len = content.pictures.length; - spanChilds.add(const TextSpan(text: '\n')); + spanChildren.add(const TextSpan(text: '\n')); if (len == 1) { Map pictureItem = content.pictures.first; picList.add(pictureItem['img_src']); - spanChilds.add( + spanChildren.add( WidgetSpan( child: LayoutBuilder( builder: (BuildContext context, BoxConstraints box) { @@ -948,7 +948,7 @@ InlineSpan buildContent( ), ); } - spanChilds.add( + spanChildren.add( WidgetSpan( child: Semantics( explicitChildNodes: true, @@ -985,7 +985,7 @@ InlineSpan buildContent( // 笔记链接 if (content.richText.isNotEmpty) { - spanChilds.add( + spanChildren.add( TextSpan( text: ' 笔记', style: TextStyle( @@ -1003,8 +1003,8 @@ InlineSpan buildContent( ), ); } - // spanChilds.add(TextSpan(text: matchMember)); - return TextSpan(children: spanChilds); + // spanChildren.add(TextSpan(text: matchMember)); + return TextSpan(children: spanChildren); } class MorePanel extends StatelessWidget { @@ -1111,7 +1111,7 @@ class MorePanel extends StatelessWidget { ), ), // 已登录用户才显示删除 - if (GStrorage.userInfo.get('userInfoCache') != null) + if (GStorage.userInfo.get('userInfoCache') != null) ListTile( onTap: () async => await menuActionHandler('delete'), minLeadingWidth: 0, diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart index 5a0d1dff..2de6a855 100644 --- a/lib/pages/video/detail/reply_new/view.dart +++ b/lib/pages/video/detail/reply_new/view.dart @@ -51,7 +51,7 @@ class _VideoReplyNewDialogState extends State // 自动聚焦 _autoFocus(); // 监听聚焦状态 - _focuslistener(); + _focusListener(); } _autoFocus() async { @@ -61,7 +61,7 @@ class _VideoReplyNewDialogState extends State } } - _focuslistener() { + _focusListener() { replyContentFocusNode.addListener(() { if (replyContentFocusNode.hasFocus) { setState(() { diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index b079be3a..45f56f5d 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -49,8 +49,8 @@ class _VideoDetailPageState extends State PlayerStatus playerStatus = PlayerStatus.playing; double doubleOffset = 0; - final Box localCache = GStrorage.localCache; - final Box setting = GStrorage.setting; + final Box localCache = GStorage.localCache; + final Box setting = GStorage.setting; late Future _futureBuilderFuture; // 自动退出全屏 late bool autoExitFullscreen; @@ -487,12 +487,12 @@ class _VideoDetailPageState extends State children: [ Obx( () { - double videoheight = context.width * 9 / 16; - final double videowidth = context.width; + double videoHeight = context.width * 9 / 16; + final double videoWidth = context.width; // print(videoDetailController.tabCtr.index); if (enableVerticalExpand && plPlayerController?.direction.value == 'vertical') { - videoheight = context.width; + videoHeight = context.width; } if (MediaQuery.of(context).orientation == Orientation.landscape && @@ -521,7 +521,7 @@ class _VideoDetailPageState extends State removeSafeArea ? 0 : MediaQuery.of(context).padding.top) - : videoheight, + : videoHeight, width: context.width, child: PopScope( canPop: isFullScreen.value != true && @@ -562,8 +562,8 @@ class _VideoDetailPageState extends State type: 'emote', src: videoDetailController .videoItem['pic'], - width: videowidth, - height: videoheight, + width: videoWidth, + height: videoHeight, ), ), ), @@ -653,16 +653,16 @@ class _VideoDetailPageState extends State Widget childWhenDisabledAlmostSquareInner = Obx(() { if (enableVerticalExpand && plPlayerController?.direction.value == 'vertical') { - final double videoheight = context.height - + final double videoHeight = context.height - (removeSafeArea ? 0 : (MediaQuery.of(context).padding.top + MediaQuery.of(context).padding.bottom)); - final double videowidth = videoheight * 9 / 16; + final double videoWidth = videoHeight * 9 / 16; return Row(children: [ SizedBox( - height: videoheight, - width: isFullScreen.value == true ? context.width : videowidth, + height: videoHeight, + width: isFullScreen.value == true ? context.width : videoWidth, child: PopScope( canPop: isFullScreen.value != true, onPopInvoked: (bool didPop) { @@ -694,8 +694,8 @@ class _VideoDetailPageState extends State child: NetworkImgLayer( type: 'emote', src: videoDetailController.videoItem['pic'], - width: videowidth, - height: videoheight, + width: videoWidth, + height: videoHeight, ), ), ), @@ -745,19 +745,19 @@ class _VideoDetailPageState extends State ), ]); } - final double videoheight = context.height / 2.5; - final double videowidth = context.width; + final double videoHeight = context.height / 2.5; + final double videoWidth = context.width; return Column( children: [ SizedBox( - width: videowidth, + width: videoWidth, height: isFullScreen.value == true ? context.height - (removeSafeArea ? 0 : (MediaQuery.of(context).padding.top + MediaQuery.of(context).padding.bottom)) - : videoheight, + : videoHeight, child: PopScope( canPop: isFullScreen.value != true, onPopInvoked: (bool didPop) { @@ -789,8 +789,8 @@ class _VideoDetailPageState extends State child: NetworkImgLayer( type: 'emote', src: videoDetailController.videoItem['pic'], - width: videowidth, - height: videoheight, + width: videoWidth, + height: videoHeight, ), ), ), @@ -833,14 +833,14 @@ class _VideoDetailPageState extends State Widget childWhenDisabledLandscapeInner = Obx(() { if (enableVerticalExpand && plPlayerController?.direction.value == 'vertical') { - final double videoheight = context.height - + final double videoHeight = context.height - (removeSafeArea ? 0 : MediaQuery.of(context).padding.top); - final double videowidth = videoheight * 9 / 16; + final double videoWidth = videoHeight * 9 / 16; return Row( children: [ SizedBox( - height: videoheight, - width: isFullScreen.value == true ? context.width : videowidth, + height: videoHeight, + width: isFullScreen.value == true ? context.width : videoWidth, child: PopScope( canPop: isFullScreen.value != true, onPopInvoked: (bool didPop) { @@ -873,8 +873,8 @@ class _VideoDetailPageState extends State child: NetworkImgLayer( type: 'emote', src: videoDetailController.videoItem['pic'], - width: videowidth, - height: videoheight, + width: videoWidth, + height: videoHeight, ), ), ), @@ -951,18 +951,18 @@ class _VideoDetailPageState extends State ], ); } - final double videowidth = + final double videoWidth = max(context.height / context.width * 1.04, 1 / 2) * context.width; - final double videoheight = videowidth * 9 / 16; + final double videoHeight = videoWidth * 9 / 16; return Row( children: [ Column( children: [ SizedBox( width: - isFullScreen.value == true ? context.width : videowidth, + isFullScreen.value == true ? context.width : videoWidth, height: - isFullScreen.value == true ? context.height : videoheight, + isFullScreen.value == true ? context.height : videoHeight, child: PopScope( canPop: isFullScreen.value != true, onPopInvoked: (bool didPop) { @@ -998,8 +998,8 @@ class _VideoDetailPageState extends State type: 'emote', src: videoDetailController .videoItem['pic'], - width: videowidth, - height: videoheight, + width: videoWidth, + height: videoHeight, ), ), ), @@ -1011,11 +1011,11 @@ class _VideoDetailPageState extends State ))), SizedBox( width: - isFullScreen.value == true ? context.width : videowidth, + isFullScreen.value == true ? context.width : videoWidth, height: isFullScreen.value == true ? 0 : context.height - - videoheight - + videoHeight - (removeSafeArea ? 0 : MediaQuery.of(context).padding.top), @@ -1041,7 +1041,7 @@ class _VideoDetailPageState extends State width: isFullScreen.value == true ? 0 : (context.width - - videowidth - + videoWidth - (removeSafeArea ? 0 : (MediaQuery.of(context).padding.left + diff --git a/lib/pages/video/detail/widgets/ai_detail.dart b/lib/pages/video/detail/widgets/ai_detail.dart index 9edc3cf4..1afbfdc9 100644 --- a/lib/pages/video/detail/widgets/ai_detail.dart +++ b/lib/pages/video/detail/widgets/ai_detail.dart @@ -160,7 +160,7 @@ class AiDetail extends StatelessWidget { // type // 1 普通文本 // 2 @用户 - List spanChilds = List.generate(descV2.length, (index) { + List spanChildren = List.generate(descV2.length, (index) { final currentDesc = descV2[index]; switch (currentDesc.type) { case 1: @@ -226,6 +226,6 @@ class AiDetail extends StatelessWidget { return const TextSpan(); } }); - return TextSpan(children: spanChilds); + return TextSpan(children: spanChildren); } } diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 0c9cd7ea..2688ab2a 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -49,8 +49,8 @@ class _HeaderControlState extends State { static const TextStyle subTitleStyle = TextStyle(fontSize: 12); static const TextStyle titleStyle = TextStyle(fontSize: 14); Size get preferredSize => const Size(double.infinity, kToolbarHeight); - final Box localCache = GStrorage.localCache; - final Box videoStorage = GStrorage.video; + final Box localCache = GStorage.localCache; + final Box videoStorage = GStorage.video; double buttonSpace = 8; bool isFullScreen = false; late String heroTag; diff --git a/lib/pages/webview/controller.dart b/lib/pages/webview/controller.dart index 2e71514d..ae5b5429 100644 --- a/lib/pages/webview/controller.dart +++ b/lib/pages/webview/controller.dart @@ -122,10 +122,10 @@ class WebviewController extends GetxController { final result = await UserHttp.userInfo(); if (result['status'] && result['data'].isLogin) { SmartDialog.showToast('登录成功，当前采用「' - '${GStrorage.setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web')}' + '${GStorage.setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web')}' '端」推荐'); try { - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; await userInfoCache.put('userInfoCache', result['data']); final HomeController homeCtr = Get.find(); diff --git a/lib/pages/whisper/controller.dart b/lib/pages/whisper/controller.dart index e4d4650f..7f81e9a3 100644 --- a/lib/pages/whisper/controller.dart +++ b/lib/pages/whisper/controller.dart @@ -52,7 +52,7 @@ class WhisperController extends GetxController { msgFeedTop[1]["value"] = msgFeedUnread.value.at; msgFeedTop[2]["value"] = msgFeedUnread.value.like; msgFeedTop[3]["value"] = msgFeedUnread.value.sys_msg; - if (GStrorage.setting.get(SettingBoxKey.disableLikeMsg, defaultValue: false)) { + if (GStorage.setting.get(SettingBoxKey.disableLikeMsg, defaultValue: false)) { msgFeedTop[2]["value"] = -1; msgFeedTop[2]["enabled"] = false; } diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index 10892beb..e3869c3b 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -16,7 +16,7 @@ class WhisperDetailController extends GetxController { //表情转换图片规则 List? eInfos; final TextEditingController replyContentController = TextEditingController(); - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; @override void onInit() { diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index 86e1da1a..c21328d4 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -28,7 +28,7 @@ class _WhisperDetailPageState extends State late double emoteHeight = 0.0; double keyboardHeight = 0.0; // 键盘高度 String toolbarType = 'none'; - Box userInfoCache = GStrorage.userInfo; + Box userInfoCache = GStorage.userInfo; @override void initState() { diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index c4b9d70c..9b10d825 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -52,7 +52,7 @@ class ChatItem extends StatelessWidget { @override Widget build(BuildContext context) { bool isOwner = - item.senderUid == GStrorage.userInfo.get('userInfoCache').mid; + item.senderUid == GStorage.userInfo.get('userInfoCache').mid; bool isPic = item.msgType == MsgType.pic.value; // 图片 bool isText = item.msgType == MsgType.text.value; // 文本 diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index eb79cbaa..59502fe9 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -26,9 +26,9 @@ import 'package:universal_platform/universal_platform.dart'; import '../../models/video/play/subtitle.dart'; // import 'package:wakelock_plus/wakelock_plus.dart'; -Box videoStorage = GStrorage.video; -Box setting = GStrorage.setting; -Box localCache = GStrorage.localCache; +Box videoStorage = GStorage.video; +Box setting = GStorage.setting; +Box localCache = GStorage.localCache; class PlPlayerController { Player? _videoPlayerController; @@ -167,7 +167,7 @@ class PlPlayerController { /// [videoPlayerController] instance of Player Player? get videoPlayerController => _videoPlayerController; - /// [videoController] instace of Player + /// [videoController] instance of Player VideoController? get videoController => _videoController; Rx get isSliderMoving => _isSliderMoving; @@ -640,7 +640,7 @@ class PlPlayerController { } Future autoEnterFullscreen() async { - bool autoEnterFullscreen = GStrorage.setting + bool autoEnterFullscreen = GStorage.setting .get(SettingBoxKey.enableAutoEnter, defaultValue: false); if (autoEnterFullscreen) { Future.delayed(const Duration(milliseconds: 500), () { @@ -735,7 +735,7 @@ class PlPlayerController { }), onPositionChanged.listen((event) { EasyThrottle.throttle( - 'mediaServicePositon', + 'mediaServicePosition', const Duration(seconds: 1), () => videoPlayerServiceHandler.onPositionChange(event)); }), @@ -951,10 +951,10 @@ class PlPlayerController { } } - Future setBrightness(double brightnes) async { + Future setBrightness(double brightness) async { try { - brightness.value = brightnes; - ScreenBrightness().setScreenBrightness(brightnes); + this.brightness.value = brightness; + ScreenBrightness().setScreenBrightness(brightness); // setVideoBrightness(); } catch (e) { throw 'Failed to set brightness'; diff --git a/lib/plugin/pl_player/models/bottom_progress_behavior.dart b/lib/plugin/pl_player/models/bottom_progress_behavior.dart index c7f1453d..9914258f 100644 --- a/lib/plugin/pl_player/models/bottom_progress_behavior.dart +++ b/lib/plugin/pl_player/models/bottom_progress_behavior.dart @@ -1,23 +1,23 @@ // ignore: camel_case_types -enum BtmProgresBehavior { +enum BtmProgressBehavior { alwaysShow, alwaysHide, onlyShowFullScreen, onlyHideFullScreen, } -extension BtmProgresBehaviorDesc on BtmProgresBehavior { +extension BtmProgresBehaviorDesc on BtmProgressBehavior { String get description => ['始终展示', '始终隐藏', '仅全屏时展示', '仅全屏时隐藏'][index]; } -extension BtmProgresBehaviorCode on BtmProgresBehavior { +extension BtmProgresBehaviorCode on BtmProgressBehavior { static final List _codeList = [0, 1, 2, 3]; int get code => _codeList[index]; - static BtmProgresBehavior? fromCode(int code) { + static BtmProgressBehavior? fromCode(int code) { final index = _codeList.indexOf(code); if (index != -1) { - return BtmProgresBehavior.values[index]; + return BtmProgressBehavior.values[index]; } return null; } diff --git a/lib/plugin/pl_player/utils/fullscreen.dart b/lib/plugin/pl_player/utils/fullscreen.dart index e681034a..1c33e414 100644 --- a/lib/plugin/pl_player/utils/fullscreen.dart +++ b/lib/plugin/pl_player/utils/fullscreen.dart @@ -46,7 +46,7 @@ Future verticalScreen() async { //全向 Future autoScreen() async { - if (!GStrorage.setting + if (!GStorage.setting .get(SettingBoxKey.allowRotateScreen, defaultValue: true)) { return; } diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 10a7609f..7edbbf02 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -83,7 +83,7 @@ class _PLVideoPlayerState extends State final RxDouble _distance = 0.0.obs; final RxBool _volumeInterceptEventStream = false.obs; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; late FullScreenMode mode; late int defaultBtmProgressBehavior; late bool enableQuickDouble; @@ -145,7 +145,7 @@ class _PLVideoPlayerState extends State widget.controller.bottomControl = widget.bottomControl; widget.controller.danmuWidget = widget.danmuWidget; defaultBtmProgressBehavior = setting.get(SettingBoxKey.btmProgressBehavior, - defaultValue: BtmProgresBehavior.values.first.code); + defaultValue: BtmProgressBehavior.values.first.code); enableQuickDouble = setting.get(SettingBoxKey.enableQuickDouble, defaultValue: true); fullScreenGestureReverse = setting @@ -895,15 +895,15 @@ class _PLVideoPlayerState extends State return Container(); } if (defaultBtmProgressBehavior == - BtmProgresBehavior.alwaysHide.code) { + BtmProgressBehavior.alwaysHide.code) { return const SizedBox(); } if (defaultBtmProgressBehavior == - BtmProgresBehavior.onlyShowFullScreen.code && + BtmProgressBehavior.onlyShowFullScreen.code && !_.isFullScreen.value) { return const SizedBox(); } else if (defaultBtmProgressBehavior == - BtmProgresBehavior.onlyHideFullScreen.code && + BtmProgressBehavior.onlyHideFullScreen.code && _.isFullScreen.value) { return const SizedBox(); } diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 2d5ef4f0..0c53aed9 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -60,7 +60,7 @@ import '../pages/whisper/index.dart'; import '../pages/whisper_detail/index.dart'; import '../utils/storage.dart'; -Box setting = GStrorage.setting; +Box setting = GStorage.setting; class Routes { static final List> getPages = [ @@ -137,7 +137,7 @@ class Routes { name: '/fontSizeSetting', page: () => const FontSizeSelectPage()), // 屏幕帧率 CustomGetPage( - name: '/displayModeSetting', page: () => const SetDiaplayMode()), + name: '/displayModeSetting', page: () => const SetDisplayMode()), // 关于 CustomGetPage(name: '/about', page: () => const AboutPage()), // diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart index 3a13aadf..d6a6f148 100644 --- a/lib/services/audio_handler.dart +++ b/lib/services/audio_handler.dart @@ -26,7 +26,7 @@ Future initAudioService() async { class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler { static final List _item = []; - Box setting = GStrorage.setting; + Box setting = GStorage.setting; bool enableBackgroundPlay = true; // PlPlayerController player = PlPlayerController.getInstance(); diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart index d3e8c78b..af99a362 100644 --- a/lib/utils/app_scheme.dart +++ b/lib/utils/app_scheme.dart @@ -8,7 +8,7 @@ import 'id_utils.dart'; import 'url_utils.dart'; import 'utils.dart'; -class PiliSchame { +class PiliScheme { static AppScheme appScheme = AppSchemeImpl.getInstance()!; static Future init() async { /// diff --git a/lib/utils/data.dart b/lib/utils/data.dart index f0ae8b1b..9344a1bc 100644 --- a/lib/utils/data.dart +++ b/lib/utils/data.dart @@ -9,8 +9,8 @@ class Data { } static Future historyStatus() async { - Box localCache = GStrorage.localCache; - Box userInfoCache = GStrorage.userInfo; + Box localCache = GStorage.localCache; + Box userInfoCache = GStorage.userInfo; if (userInfoCache.get('userInfoCache') == null) { return; } diff --git a/lib/utils/feed_back.dart b/lib/utils/feed_back.dart index b0f9f035..4a29af21 100644 --- a/lib/utils/feed_back.dart +++ b/lib/utils/feed_back.dart @@ -2,7 +2,7 @@ import 'package:flutter/services.dart'; import 'package:hive/hive.dart'; import 'storage.dart'; -Box setting = GStrorage.setting; +Box setting = GStorage.setting; void feedBack() { // 设置中是否开启 final bool enable = diff --git a/lib/utils/grid.dart b/lib/utils/grid.dart index 0ce07b4c..aa41d484 100644 --- a/lib/utils/grid.dart +++ b/lib/utils/grid.dart @@ -4,14 +4,14 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/rendering.dart'; import 'storage.dart'; class Grid { - static double maxRowWidth = GStrorage.setting.get(SettingBoxKey.maxRowWidth, defaultValue: 240.0) as double; + static double maxRowWidth = GStorage.setting.get(SettingBoxKey.maxRowWidth, defaultValue: 240.0) as double; // // static double calculateActualWidth(BuildContext context, double maxCrossAxisExtent, double crossAxisSpacing, {double? screenWidthOffset}) { // double screenWidth = MediaQuery.of(context).size.width; // if (screenWidthOffset != null) { // screenWidth -= screenWidthOffset; // } - // if (GStrorage.setting.get(SettingBoxKey.useSideBar, defaultValue: false) as bool) { + // if (GStorage.setting.get(SettingBoxKey.useSideBar, defaultValue: false) as bool) { // screenWidth -= 55; // } // int columnCount = ((screenWidth - crossAxisSpacing) / (maxCrossAxisExtent + crossAxisSpacing)).ceil(); diff --git a/lib/utils/recommend_filter.dart b/lib/utils/recommend_filter.dart index 61e37ed3..e6cc58de 100644 --- a/lib/utils/recommend_filter.dart +++ b/lib/utils/recommend_filter.dart @@ -13,7 +13,7 @@ class RecommendFilter { } static void update() { - var setting = GStrorage.setting; + var setting = GStorage.setting; // filterUnfollowedRatio = // setting.get(SettingBoxKey.filterUnfollowedRatio, defaultValue: 0); minDurationForRcmd = diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 2c6e9d79..037ab5df 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -7,9 +7,9 @@ import 'package:PiliPalaX/models/search/hot.dart'; import 'package:PiliPalaX/models/user/info.dart'; import 'global_data.dart'; -class GStrorage { +class GStorage { static late final Box userInfo; - static late final Box historyword; + static late final Box historyWord; static late final Box localCache; static late final Box setting; static late final Box video; @@ -36,7 +36,7 @@ class GStrorage { // 设置 setting = await Hive.openBox('setting'); // 搜索历史 - historyword = await Hive.openBox( + historyWord = await Hive.openBox( 'historyWord', compactionStrategy: (int entries, int deletedEntries) { return deletedEntries > 10; @@ -76,8 +76,8 @@ class GStrorage { // user.close(); userInfo.compact(); userInfo.close(); - historyword.compact(); - historyword.close(); + historyWord.compact(); + historyWord.close(); localCache.compact(); localCache.close(); setting.compact(); diff --git a/lib/utils/wbi_sign.dart b/lib/utils/wbi_sign.dart index 5da75da1..dff0ba42 100644 --- a/lib/utils/wbi_sign.dart +++ b/lib/utils/wbi_sign.dart @@ -9,7 +9,7 @@ import '../http/index.dart'; import 'storage.dart'; class WbiSign { - static Box localCache = GStrorage.localCache; + static Box localCache = GStorage.localCache; final List mixinKeyEncTab = [ 46, 47,