From ddf7d82656a8d2b857ff6fd6d06a8c752bf9d66d Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Wed, 30 Apr 2025 18:50:25 +0800 Subject: [PATCH] fix: #779 Signed-off-by: bggRGjQaUbCoE --- lib/pages/common/common_controller.dart | 14 -------------- lib/pages/dynamics/controller.dart | 15 --------------- lib/pages/main/view.dart | 4 ++-- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/lib/pages/common/common_controller.dart b/lib/pages/common/common_controller.dart index 6475431b..4da35872 100644 --- a/lib/pages/common/common_controller.dart +++ b/lib/pages/common/common_controller.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -12,19 +11,6 @@ abstract mixin class ScrollOrRefreshMixin { void animateToTop() => scrollController.animToTop(); Future onRefresh(); - - void toTopOrRefresh() { - if (scrollController.hasClients) { - if (scrollController.position.pixels == 0) { - EasyThrottle.throttle('topOrRefresh', const Duration(milliseconds: 500), - () { - onRefresh(); - }); - } else { - animateToTop(); - } - } - } } abstract class CommonController extends GetxController diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 8bf6945f..650d54d0 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -188,21 +188,6 @@ class DynamicsController extends GetxController scrollController.animToTop(); } - @override - FutureOr toTopOrRefresh() { - final ctr = controller; - if (scrollController.hasClients && ctr.scrollController.hasClients) { - if (scrollController.position.pixels == 0 && - ctr.scrollController.position.pixels == 0) { - return onRefresh(); - } else { - animateToTop(); - } - } else { - super.toTopOrRefresh(); - } - } - @override void onClose() { tabController.dispose(); diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index c7280343..a053825c 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -152,9 +152,9 @@ class _MainAppState extends State }); } else { if (currentPage is HomePage) { - _homeController.toTopOrRefresh(); + _homeController.animateToTop(); } else if (currentPage is DynamicsPage) { - _dynamicController.toTopOrRefresh(); + _dynamicController.animateToTop(); } } _lastSelectTime = now;