diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart index e8c4c21c5..5a596198a 100644 --- a/lib/pages/fav/view.dart +++ b/lib/pages/fav/view.dart @@ -82,11 +82,14 @@ class _FavPageState extends State with SingleTickerProviderStateMixin { () => _showVideoFavMenu.value ? IconButton( onPressed: () { - if (!_favController.isEnd) { - SmartDialog.showToast('加载全部收藏夹再排序'); - return; + if (_favController.loadingState.value.isSuccess) { + if (!_favController.isEnd) { + SmartDialog.showToast('加载全部收藏夹再排序'); + return; + } + Get.to( + FavFolderSortPage(favController: _favController)); } - Get.to(FavFolderSortPage(favController: _favController)); }, icon: const Icon(Icons.sort), tooltip: '收藏夹排序', diff --git a/lib/pages/fav_folder_sort/view.dart b/lib/pages/fav_folder_sort/view.dart index b3edba644..ae7256022 100644 --- a/lib/pages/fav_folder_sort/view.dart +++ b/lib/pages/fav_folder_sort/view.dart @@ -23,44 +23,6 @@ class _FavFolderSortPageState extends State { late List sortList = List.from(_favController.loadingState.value.data!); - final ScrollController _scrollController = ScrollController(); - - void listener() { - if (_favController.isEnd) { - return; - } - if (_scrollController.position.pixels >= - _scrollController.position.maxScrollExtent - 200) { - _favController.onLoadMore().whenComplete(() { - try { - if (_favController.loadingState.value.isSuccess) { - List list = _favController.loadingState.value.data!; - sortList.addAll(list.sublist(sortList.length)); - if (mounted) { - setState(() {}); - } - } - } catch (_) {} - }); - } - } - - @override - void initState() { - super.initState(); - if (!_favController.isEnd) { - _scrollController.addListener(listener); - } - } - - @override - void dispose() { - _scrollController - ..removeListener(listener) - ..dispose(); - super.dispose(); - } - @override Widget build(BuildContext context) { return Scaffold( @@ -112,7 +74,6 @@ class _FavFolderSortPageState extends State { Widget get _buildBody { return ReorderableListView.builder( key: _key, - scrollController: _scrollController, onReorder: onReorder, physics: const AlwaysScrollableScrollPhysics(), footer: SizedBox( diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart index 465f23c42..7ac9a6d84 100644 --- a/lib/pages/live_room/send_danmaku/view.dart +++ b/lib/pages/live_room/send_danmaku/view.dart @@ -83,7 +83,6 @@ class _ReplyPageState extends CommonPublishPageState { message: emote.emoticonUnique!, dmType: 1, emoticonOptions: '[object Object]', - emoticonUnique: emote.emoji, ); }, ); @@ -189,7 +188,6 @@ class _ReplyPageState extends CommonPublishPageState { List? pictures, int? dmType, emoticonOptions, - emoticonUnique, }) async { final res = await LiveHttp.sendLiveMsg( roomId: liveRoomController.roomId, diff --git a/lib/pages/whisper_settings/controller.dart b/lib/pages/whisper_settings/controller.dart index fec91c4bb..7f2bd49d3 100644 --- a/lib/pages/whisper_settings/controller.dart +++ b/lib/pages/whisper_settings/controller.dart @@ -14,7 +14,7 @@ class WhisperSettingsController final IMSettingType imSettingType; - RxString title = ''.obs; + final RxString title = ''.obs; @override void onInit() {