基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
optimize popular page and controller
lauirfea38039d7f75
diff --git a/lib/pages/popular/popular_controller.dart b/lib/pages/popular/popular_controller.dartindex b5e97e1a..13113836 100644--- a/lib/pages/popular/popular_controller.dart+++ b/lib/pages/popular/popular_controller.dart@@ -19,23 +19,38 @@ abstract class _PopularController with Store {ObservableList<BangumiItem> bangumiList = ObservableList.of([]);double scrollOffset = 0.0;++ @observablebool isLoadingMore = false;+ @observable+ bool isTimeOut = false;+- Future<bool> queryBangumiListFeed({String type = 'init', String tag = '', bool useCurrTag = false}) async {- if(!useCurrTag){- currentTag = tag;+ Future<bool> queryBangumiListFeed() async {+ isLoadingMore = true;+ int randomNumber = Random().nextInt(1000) + 1;+ var tag = currentTag;+ var result = await BangumiHTTP.getBangumiList(rank: randomNumber, tag: tag);+ if (currentTag == tag) {+ bangumiList.addAll(result);+ isLoadingMore = false;+ isTimeOut = bangumiList.isEmpty;+ return true;}+ return false;+ }++ Future<bool> queryBangumiListFeedByTag(String tag) async {+ currentTag = tag;isLoadingMore = true;- var random = Random();- int randomNumber = random.nextInt(1000) + 1;+ int randomNumber = Random().nextInt(1000) + 1;var result = await BangumiHTTP.getBangumiList(rank: randomNumber, tag: tag);if (currentTag == tag) {- if (type == 'init') {- bangumiList.clear();- }+ bangumiList.clear();bangumiList.addAll(result);isLoadingMore = false;+ isTimeOut = bangumiList.isEmpty;return true;}return false;diff --git a/lib/pages/popular/popular_controller.g.dart b/lib/pages/popular/popular_controller.g.dartindex a8631e5b..c308be20 100644--- a/lib/pages/popular/popular_controller.g.dart+++ b/lib/pages/popular/popular_controller.g.dart@@ -25,10 +25,44 @@ mixin _$PopularController on _PopularController, Store {});}+ late final _$isLoadingMoreAtom =+ Atom(name: '_PopularController.isLoadingMore', context: context);++ @override+ bool get isLoadingMore {+ _$isLoadingMoreAtom.reportRead();+ return super.isLoadingMore;+ }++ @override+ set isLoadingMore(bool value) {+ _$isLoadingMoreAtom.reportWrite(value, super.isLoadingMore, () {+ super.isLoadingMore = value;+ });+ }++ late final _$isTimeOutAtom =+ Atom(name: '_PopularController.isTimeOut', context: context);++ @override+ bool get isTimeOut {+ _$isTimeOutAtom.reportRead();+ return super.isTimeOut;+ }++ @override+ set isTimeOut(bool value) {+ _$isTimeOutAtom.reportWrite(value, super.isTimeOut, () {+ super.isTimeOut = value;+ });+ }+@overrideString toString() {return '''-bangumiList: ${bangumiList}+bangumiList: ${bangumiList},+isLoadingMore: ${isLoadingMore},+isTimeOut: ${isTimeOut}''';}}diff --git a/lib/pages/popular/popular_page.dart b/lib/pages/popular/popular_page.dartindex 43b33bf7..52cb791c 100644--- a/lib/pages/popular/popular_page.dart+++ b/lib/pages/popular/popular_page.dart@@ -24,8 +24,6 @@ class PopularPage extends StatefulWidget {class _PopularPageState extends State<PopularPage>with AutomaticKeepAliveClientMixin {DateTime? _lastPressedAt;- bool timeout = false;- bool searchLoading = false;bool showTagFilter = true;bool showSearchBar = false;final FocusNode _focusNode = FocusNode();@@ -39,7 +37,6 @@ class _PopularPageState extends State<PopularPage>@overridevoid initState() {super.initState();- timeout = false;scrollController.addListener(() {popularController.scrollOffset = scrollController.offset;if (scrollController.position.pixels >=@@ -47,18 +44,11 @@ class _PopularPageState extends State<PopularPage>popularController.isLoadingMore == false &&popularController.searchKeyword == '') {KazumiLogger().log(Level.info, 'Popular is loading more');- popularController.queryBangumiListFeed(- type: 'onload', useCurrTag: true);+ popularController.queryBangumiListFeed();}});if (popularController.bangumiList.isEmpty) {- popularController.queryBangumiListFeed().then((succ) {- if (popularController.bangumiList.isEmpty && mounted && succ) {- setState(() {- timeout = true;- });- }- });+ popularController.queryBangumiListFeed();}}@@ -101,20 +91,7 @@ class _PopularPageState extends State<PopularPage>},child: RefreshIndicator(onRefresh: () async {- if (mounted) {- setState(() {- timeout = false;- });- }- await popularController- .queryBangumiListFeed(useCurrTag: true)- .then((succ) {- if (popularController.bangumiList.isEmpty && mounted && succ) {- setState(() {- timeout = true;- });- }- });+ await popularController.queryBangumiListFeed();},child: Scaffold(appBar: SysAppBar(@@ -153,13 +130,9 @@ class _PopularPageState extends State<PopularPage>_focusNode.unfocus();setState(() {showSearchBar = false;- searchLoading = true;});popularController.searchKeyword == '';- await popularController.queryBangumiListFeed();- setState(() {- searchLoading = false;- });+ await popularController.queryBangumiListFeedByTag('');} else {keywordController.text = '';popularController.searchKeyword = '';@@ -204,38 +177,13 @@ class _PopularPageState extends State<PopularPage>},controller: keywordController,onFieldSubmitted: (t) async {- setState(() {- timeout = false;- searchLoading = true;- });if (t != '') {popularController.searchKeyword = t;- await popularController- .queryBangumi(popularController.searchKeyword)- .then((_) {- if (popularController.bangumiList.isEmpty &&- mounted) {- setState(() {- timeout = true;- });- }- });+ await popularController.queryBangumi(popularController.searchKeyword);} else {popularController.searchKeyword = '';- await popularController- .queryBangumiListFeed()- .then((succ) {- if (popularController.bangumiList.isEmpty &&- mounted && succ) {- setState(() {- timeout = true;- });- }- });+ await popularController.queryBangumiListFeedByTag("");}- setState(() {- searchLoading = false;- });},),),@@ -257,12 +205,14 @@ class _PopularPageState extends State<PopularPage>controller: scrollController,slivers: [SliverToBoxAdapter(- child: Padding(- padding: const EdgeInsets.only(- top: 0, bottom: 10, left: 0),- child: searchLoading- ? const LinearProgressIndicator()- : Container(),+ child: Observer(+ builder: (_) => Padding(+ padding: const EdgeInsets.only(+ top: 0, bottom: 10, left: 0),+ child: popularController.isLoadingMore+ ? const LinearProgressIndicator()+ : Container(),+ ),),),SliverPadding(@@ -273,29 +223,16 @@ class _PopularPageState extends State<PopularPage>0),sliver: Observer(builder: (context) {if (popularController.bangumiList.isEmpty &&- timeout) {+ popularController.isTimeOut) {return HttpError(errMsg: '什么都没有找到 (´;ω;`)',fn: () {- setState(() {- timeout = false;- });- popularController- .queryBangumiListFeed()- .then((succ) {- if (popularController- .bangumiList.isEmpty &&- mounted && succ) {- setState(() {- timeout = true;- });- }- });+ popularController.queryBangumiListFeed();},);}if (popularController.bangumiList.isEmpty &&- !timeout) {+ !popularController.isTimeOut) {return SliverToBoxAdapter(child: SizedBox(height:@@ -396,24 +333,7 @@ class _PopularPageState extends State<PopularPage>child: Text(filter),onPressed: () async {scrollController.jumpTo(0.0);- setState(() {- timeout = false;- searchLoading = true;- });- await popularController- .queryBangumiListFeed(tag: '')- .then((succ) {- if (popularController.bangumiList.isEmpty &&- mounted &&- succ) {- setState(() {- timeout = true;- });- }- });- setState(() {- searchLoading = false;- });+ await popularController.queryBangumiListFeedByTag('');},): FilledButton.tonal(@@ -422,27 +342,10 @@ class _PopularPageState extends State<PopularPage>_focusNode.unfocus();scrollController.jumpTo(0.0);setState(() {- timeout = false;keywordController.text = '';showSearchBar = false;- searchLoading = true;- });- await popularController- .queryBangumiListFeed(- tag: filter,- )- .then((succ) {- if (popularController.bangumiList.isEmpty &&- mounted &&- succ) {- setState(() {- timeout = true;- });- }- });- setState(() {- searchLoading = false;});+ await popularController.queryBangumiListFeedByTag(filter);},),);