From 7f115c121443d0e09b6f3d7caaf3788a787e2cbf Mon Sep 17 00:00:00 2001 From: laiiihz Date: Sun, 18 Oct 2020 16:19:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E6=8C=89=E9=92=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20=E5=BD=95=E6=92=AD=E4=B8=8A=E4=BC=A0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live_stream/live_playback_view_page.dart | 19 +++++++++++++------ .../live_stream/live_stream_view_page.dart | 1 + lib/pages/live/sub_page/live_stream_page.dart | 6 +++++- lib/pages/live/sub_page/video_page.dart | 10 +++++----- pubspec.lock | 2 +- pubspec.yaml | 2 +- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/lib/pages/live/live_stream/live_playback_view_page.dart b/lib/pages/live/live_stream/live_playback_view_page.dart index 88054ce..19e6059 100644 --- a/lib/pages/live/live_stream/live_playback_view_page.dart +++ b/lib/pages/live/live_stream/live_playback_view_page.dart @@ -13,6 +13,7 @@ import 'package:recook/pages/live/sub_page/user_home_page.dart'; import 'package:recook/pages/live/widget/live_user_bar.dart'; import 'package:recook/utils/custom_route.dart'; import 'package:recook/widgets/custom_image_button.dart'; +import 'package:recook/widgets/recook_back_button.dart'; import 'package:video_player/video_player.dart'; class LivePlaybackViewPage extends StatefulWidget { @@ -84,12 +85,18 @@ class _LivePlaybackViewPageState extends State { return Scaffold( backgroundColor: Colors.black87, body: upload - ? Center( - child: Text( - '录播上传中', - style: TextStyle( - color: Colors.white, - fontSize: rSP(20), + ? Scaffold( + appBar: AppBar( + backgroundColor: Colors.black, + leading: RecookBackButton(white: true)), + backgroundColor: Colors.black, + body: Center( + child: Text( + '录播上传中,请稍后再试', + style: TextStyle( + color: Colors.white, + fontSize: rSP(20), + ), ), ), ) diff --git a/lib/pages/live/live_stream/live_stream_view_page.dart b/lib/pages/live/live_stream/live_stream_view_page.dart index 765202a..e31736c 100644 --- a/lib/pages/live/live_stream/live_stream_view_page.dart +++ b/lib/pages/live/live_stream/live_stream_view_page.dart @@ -556,6 +556,7 @@ class _LiveStreamViewPageState extends State { width: rSize(32), height: rSize(32), ), + extraLikeCount: 1, popChild: Image.asset( R.ASSETS_LIVE_LIVE_LIKE_PNG, width: rSize(32), diff --git a/lib/pages/live/sub_page/live_stream_page.dart b/lib/pages/live/sub_page/live_stream_page.dart index 57f817d..e05800b 100644 --- a/lib/pages/live/sub_page/live_stream_page.dart +++ b/lib/pages/live/sub_page/live_stream_page.dart @@ -210,10 +210,14 @@ class _LiveStreamPageState extends State onLoadMore: () { _livePage++; getLiveListModels().then((models) { - _liveListController.loadComplete(); setState(() { _liveListModels.addAll(models); }); + + if (models.isEmpty) + _liveListController.loadNoData(); + else + _liveListController.loadComplete(); }); }, body: GridView.builder( diff --git a/lib/pages/live/sub_page/video_page.dart b/lib/pages/live/sub_page/video_page.dart index 2d250c4..fd2d697 100644 --- a/lib/pages/live/sub_page/video_page.dart +++ b/lib/pages/live/sub_page/video_page.dart @@ -3,10 +3,7 @@ import 'package:recook/const/resource.dart'; import 'package:recook/constants/api.dart'; import 'package:recook/constants/constants.dart'; import 'package:recook/manager/http_manager.dart'; -import 'package:recook/pages/live/activity/activity_preview_page.dart'; import 'package:recook/pages/live/activity/video_fall_through_page.dart'; -import 'package:recook/pages/live/models/activity_list_model.dart'; -import 'package:recook/pages/live/models/live_base_info_model.dart'; import 'package:recook/pages/live/models/video_list_model.dart'; import 'package:recook/utils/custom_route.dart'; import 'package:recook/widgets/refresh_widget.dart'; @@ -56,7 +53,10 @@ class _VideoPageState extends State _getVideoList().then((models) { _videoListModels.addAll(models); if (mounted) setState(() {}); - _controller.loadComplete(); + if (models.isEmpty) + _controller.loadNoData(); + else + _controller.loadComplete(); }); }, body: WaterfallFlow.builder( @@ -167,7 +167,7 @@ class _VideoPageState extends State Future> _getVideoList() async { ResultData resultData = await HttpManager.post(LiveAPI.videoList, { 'page': _page, - 'limit': 12, + 'limit': 16, }); if (resultData?.data['data']['list'] == null) return []; diff --git a/pubspec.lock b/pubspec.lock index 63aaa03..b146d22 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -640,7 +640,7 @@ packages: name: many_like url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.4" + version: "0.0.6" matcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8ddfb62..e3dccfa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -198,7 +198,7 @@ dependencies: video_trimmer: ^0.2.7 #点赞组件 - many_like: ^0.0.4 + many_like: ^0.0.6 wakelock: