点赞按钮更新

录播上传界面修改

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,14 +85,20 @@ class _LivePlaybackViewPageState extends State<LivePlaybackViewPage> {
     return Scaffold(
       backgroundColor: Colors.black87,
       body: upload
-          ? Center(
+          ? 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),
                   ),
                 ),
+              ),
             )
           : _streamInfoModel == null
               ? Center(child: CircularProgressIndicator())

lib/pages/live/live_stream/live_stream_view_page.dart

@@ -556,6 +556,7 @@ class _LiveStreamViewPageState extends State<LiveStreamViewPage> {
                                 width: rSize(32),
                                 height: rSize(32),
                               ),
+                              extraLikeCount: 1,
                               popChild: Image.asset(
                                 R.ASSETS_LIVE_LIVE_LIKE_PNG,
                                 width: rSize(32),

lib/pages/live/sub_page/live_stream_page.dart

@@ -210,10 +210,14 @@ class _LiveStreamPageState extends State<LiveStreamPage>
       onLoadMore: () {
         _livePage++;
         getLiveListModels().then((models) {
-          _liveListController.loadComplete();
           setState(() {
             _liveListModels.addAll(models);
           });
+
+          if (models.isEmpty)
+            _liveListController.loadNoData();
+          else
+            _liveListController.loadComplete();
         });
       },
       body: GridView.builder(

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,6 +53,9 @@ class _VideoPageState extends State<VideoPage>
         _getVideoList().then((models) {
           _videoListModels.addAll(models);
           if (mounted) setState(() {});
+          if (models.isEmpty)
+            _controller.loadNoData();
+          else
             _controller.loadComplete();
         });
       },
@@ -167,7 +167,7 @@ class _VideoPageState extends State<VideoPage>
   Future<List<VideoListModel>> _getVideoList() async {
     ResultData resultData = await HttpManager.post(LiveAPI.videoList, {
       'page': _page,
-      'limit': 12,
+      'limit': 16,
     });
     if (resultData?.data['data']['list'] == null)
       return [];

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:

pubspec.yaml

@@ -198,7 +198,7 @@ dependencies:
   video_trimmer: ^0.2.7
 
   #点赞组件
-  many_like: ^0.0.4
+  many_like: ^0.0.6
 
   wakelock: