diff --git a/lib/pages/live/sub_page/user_attention/user_attention_view.dart b/lib/pages/live/sub_page/user_attention/user_attention_view.dart index f254790..e491078 100644 --- a/lib/pages/live/sub_page/user_attention/user_attention_view.dart +++ b/lib/pages/live/sub_page/user_attention/user_attention_view.dart @@ -53,7 +53,10 @@ class _UserAttentionViewState extends State getUserModels().then((models) { followModels.addAll(models); if (mounted) setState(() {}); - _controller.loadComplete(); + if (models.isEmpty) + _controller.loadNoData(); + else + _controller.loadComplete(); }); }, body: ListView.builder( diff --git a/lib/pages/live/sub_page/user_home/user_activity_view.dart b/lib/pages/live/sub_page/user_home/user_activity_view.dart index b524fb3..50521c5 100644 --- a/lib/pages/live/sub_page/user_home/user_activity_view.dart +++ b/lib/pages/live/sub_page/user_home/user_activity_view.dart @@ -46,14 +46,26 @@ class _UserActivityViewState extends State return RefreshWidget( controller: _controller, onRefresh: () { + _page = 1; getActivityModels().then((models) { - _page = 1; setState(() { activityListModels = models; }); _controller.refreshCompleted(); }); }, + onLoadMore: () { + _page++; + getActivityModels().then((models) { + setState(() { + activityListModels.addAll(models); + }); + if (models.isEmpty) + _controller.loadNoData(); + else + _controller.loadComplete(); + }); + }, body: ListView.builder( itemBuilder: (context, index) { return UserActivityCard( diff --git a/lib/pages/live/sub_page/user_home/user_playback_view.dart b/lib/pages/live/sub_page/user_home/user_playback_view.dart index 8703921..9c4c4a4 100644 --- a/lib/pages/live/sub_page/user_home/user_playback_view.dart +++ b/lib/pages/live/sub_page/user_home/user_playback_view.dart @@ -50,14 +50,17 @@ class _UserPlaybackViewState extends State _page++; getActivityVideoList().then((models) { setState(() { - _videoModels.addAll(models) ; + _videoModels.addAll(models); }); - _controller.loadComplete(); + if (models.isEmpty) + _controller.loadNoData(); + else + _controller.loadComplete(); }); }, body: ListView.builder( itemBuilder: (context, index) { - return UserPlaybackCard(model:_videoModels[index]); + return UserPlaybackCard(model: _videoModels[index]); }, itemCount: _videoModels.length, ), diff --git a/lib/pages/tabBar/TabbarWidget.dart b/lib/pages/tabBar/TabbarWidget.dart index 3b4e3b3..af92937 100644 --- a/lib/pages/tabBar/TabbarWidget.dart +++ b/lib/pages/tabBar/TabbarWidget.dart @@ -147,7 +147,8 @@ class _TabBarWidgetState extends State .then((value) { PermissionTool.haveAudioPermission() .then((value) { - CRoute.push(context, LivePage()); + CRoute.pushReplace( + context, LivePage()); }); }); }, @@ -155,7 +156,7 @@ class _TabBarWidgetState extends State verticalButton( '视频', R.ASSETS_LIVE_ADD_VIDEO_PNG, - onTap: () => CRoute.push( + onTap: () => CRoute.pushReplace( context, AddVideoPage()), ), // verticalButton( diff --git a/pubspec.yaml b/pubspec.yaml index 7e68ece..0dc629b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -59,7 +59,7 @@ dependencies: url_launcher: ^5.1.3 # 视频组件 video_player: ^0.10.11+1 - chewie: ^0.9.8 + chewie: ^0.9.10 # 权限组件 permission_handler: 3.3.0 @@ -195,6 +195,7 @@ dependencies: #点赞组件 many_like: ^0.0.3 + dev_dependencies: flutter_test: