对接视频列表接口

lib/constants/api.dart

@@ -414,4 +414,7 @@ class LiveAPI {
 
   ///话题详情列表
   static const String topicContentList = '/v1/live/topic/content/list';
+
+  ///视频列表
+  static const String videoList = '/v1/live/short/list';
 }

lib/pages/live/models/video_list_model.dart

@@ -0,0 +1,52 @@
+class VideoListModel {
+  int userId;
+  String nickname;
+  String headImgUrl;
+  String content;
+  String coverUrl;
+  int trendId;
+  int originId;
+  int trendType;
+  int praise;
+  int isPraise;
+
+  VideoListModel(
+      {this.userId,
+      this.nickname,
+      this.headImgUrl,
+      this.content,
+      this.coverUrl,
+      this.trendId,
+      this.originId,
+      this.trendType,
+      this.praise,
+      this.isPraise});
+
+  VideoListModel.fromJson(Map<String, dynamic> json) {
+    userId = json['userId'];
+    nickname = json['nickname'];
+    headImgUrl = json['headImgUrl'];
+    content = json['content'];
+    coverUrl = json['coverUrl'];
+    trendId = json['trendId'];
+    originId = json['originId'];
+    trendType = json['trendType'];
+    praise = json['praise'];
+    isPraise = json['isPraise'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['userId'] = this.userId;
+    data['nickname'] = this.nickname;
+    data['headImgUrl'] = this.headImgUrl;
+    data['content'] = this.content;
+    data['coverUrl'] = this.coverUrl;
+    data['trendId'] = this.trendId;
+    data['originId'] = this.originId;
+    data['trendType'] = this.trendType;
+    data['praise'] = this.praise;
+    data['isPraise'] = this.isPraise;
+    return data;
+  }
+}

lib/pages/live/sub_page/live_stream_page.dart

@@ -6,7 +6,6 @@ import 'package:recook/manager/user_manager.dart';
 import 'package:recook/pages/live/live_stream/live_stream_view_page.dart';
 import 'package:recook/pages/live/models/follow_list_model.dart';
 import 'package:recook/pages/live/sub_page/user_attention_page.dart';
-import 'package:recook/pages/live/sub_page/user_home_page.dart';
 import 'package:recook/utils/custom_route.dart';
 import 'package:recook/widgets/custom_image_button.dart';
 
@@ -17,7 +16,8 @@ class LiveStreamPage extends StatefulWidget {
   _LiveStreamPageState createState() => _LiveStreamPageState();
 }
 
-class _LiveStreamPageState extends State<LiveStreamPage> {
+class _LiveStreamPageState extends State<LiveStreamPage>
+    with AutomaticKeepAliveClientMixin {
   List<FollowListModel> followListModels = [];
 
   @override
@@ -34,6 +34,7 @@ class _LiveStreamPageState extends State<LiveStreamPage> {
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Column(
       children: [
         _buildAttentions(),
@@ -321,4 +322,7 @@ class _LiveStreamPageState extends State<LiveStreamPage> {
           .map((e) => FollowListModel.fromJson(e))
           .toList();
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

lib/pages/live/sub_page/video_page.dart

@@ -2,7 +2,11 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 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/models/video_list_model.dart';
+import 'package:recook/widgets/refresh_widget.dart';
 import 'package:waterfall_flow/waterfall_flow.dart';
 
 class VideoPage extends StatefulWidget {
@@ -12,90 +16,140 @@ class VideoPage extends StatefulWidget {
   _VideoPageState createState() => _VideoPageState();
 }
 
-class _VideoPageState extends State<VideoPage> {
+class _VideoPageState extends State<VideoPage>
+    with AutomaticKeepAliveClientMixin {
+  GSRefreshController _controller = GSRefreshController();
+  int _page = 1;
+  List<VideoListModel> _videoListModels = [];
   @override
   Widget build(BuildContext context) {
-    return WaterfallFlow.builder(
-      padding: EdgeInsets.all(rSize(15)),
-      gridDelegate: SliverWaterfallFlowDelegateWithFixedCrossAxisCount(
-        crossAxisCount: 2,
-        crossAxisSpacing: rSize(15),
-        mainAxisSpacing: rSize(15),
+    super.build(context);
+    return RefreshWidget(
+      controller: _controller,
+      onRefresh: () {
+        _page = 1;
+        _getVideoList().then((models) {
+          _videoListModels = models;
+          if (mounted) setState(() {});
+          _controller.refreshCompleted();
+        });
+      },
+      onLoadMore: () {
+        _page++;
+        _getVideoList().then((models) {
+          _videoListModels.addAll(models);
+          if (mounted) setState(() {});
+          _controller.loadComplete();
+        });
+      },
+      body: WaterfallFlow.builder(
+        padding: EdgeInsets.all(rSize(15)),
+        gridDelegate: SliverWaterfallFlowDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 2,
+          crossAxisSpacing: rSize(15),
+          mainAxisSpacing: rSize(15),
+        ),
+        itemBuilder: (context, index) {
+          return _buildVideoCard(_videoListModels[index]);
+        },
+        itemCount: _videoListModels.length,
       ),
-      itemBuilder: (context, index) {
-        //TODO: TEST ONLY
-        final randomHeight = 50 + Random().nextDouble() * 150;
-        return ClipRRect(
-          borderRadius: BorderRadius.circular(rSize(10)),
-          child: Container(
-            color: Colors.white,
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                SizedBox(
-                  height: randomHeight,
-                  child: Placeholder(),
-                ),
-                Container(
-                  padding: EdgeInsets.all(rSize(10)),
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
+    );
+  }
+
+  _buildVideoCard(VideoListModel model) {
+    return ClipRRect(
+      borderRadius: BorderRadius.circular(rSize(10)),
+      child: Container(
+        color: Colors.white,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            FadeInImage.assetNetwork(
+              placeholder: R.ASSETS_PLACEHOLDER_NEW_1X1_A_PNG,
+              image: Api.getImgUrl(model.coverUrl),
+            ),
+            Container(
+              padding: EdgeInsets.all(rSize(10)),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    model.content,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      color: Color(0xFF333333),
+                      fontWeight: FontWeight.w600,
+                      fontSize: rSP(13),
+                    ),
+                  ),
+                  SizedBox(height: rSize(6)),
+                  Row(
                     children: [
-                      Text(
-                        '更有3档风速可调，风大风小随你掌控更有3档风速可调，风大风小随你掌控',
-                        maxLines: 2,
-                        overflow: TextOverflow.ellipsis,
-                        style: TextStyle(
-                          color: Color(0xFF333333),
-                          fontWeight: FontWeight.w600,
-                          fontSize: rSP(13),
+                      ClipRRect(
+                        borderRadius: BorderRadius.circular(9),
+                        child: FadeInImage.assetNetwork(
+                          placeholder: R.ASSETS_PLACEHOLDER_NEW_1X1_A_PNG,
+                          image: Api.getImgUrl(model.headImgUrl),
+                          height: rSize(18),
+                          width: rSize(18),
                         ),
                       ),
-                      SizedBox(height: rSize(6)),
-                      Row(
-                        children: [
-                          CircleAvatar(
-                            radius: rSize(9),
-                          ),
-                          Expanded(
-                            child: Padding(
-                              padding: EdgeInsets.symmetric(
-                                horizontal: rSize(4),
-                              ),
-                              child: Text(
-                                'NAME NAME NAME',
-                                maxLines: 1,
-                                overflow: TextOverflow.ellipsis,
-                                style: TextStyle(
-                                  color: Color(0xFF666666),
-                                  fontSize: rSP(12),
-                                ),
-                              ),
-                            ),
-                          ),
-                          Image.asset(
-                            R.ASSETS_LIVE_FAVORITE_BLACK_PNG,
-                            height: rSize(14),
-                            width: rSize(14),
+                      Expanded(
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(
+                            horizontal: rSize(4),
                           ),
-                          SizedBox(width: rSize(2)),
-                          Text(
-                            '${Random().nextInt(100)}',
+                          child: Text(
+                            model.nickname,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
                             style: TextStyle(
                               color: Color(0xFF666666),
                               fontSize: rSP(12),
                             ),
                           ),
-                        ],
+                        ),
+                      ),
+                      Image.asset(
+                        R.ASSETS_LIVE_FAVORITE_BLACK_PNG,
+                        height: rSize(14),
+                        width: rSize(14),
+                      ),
+                      SizedBox(width: rSize(2)),
+                      Text(
+                        model.praise.toString(),
+                        style: TextStyle(
+                          color: Color(0xFF666666),
+                          fontSize: rSP(12),
+                        ),
                       ),
                     ],
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
-          ),
-        );
-      },
+          ],
+        ),
+      ),
     );
   }
+
+  Future<List<VideoListModel>> _getVideoList() async {
+    ResultData resultData = await HttpManager.post(LiveAPI.videoList, {
+      'page': _page,
+      'limit': 12,
+    });
+    if (resultData?.data['data']['list'] == null)
+      return [];
+    else
+      return (resultData.data['data']['list'] as List)
+          .map((e) => VideoListModel.fromJson(e))
+          .toList();
+  }
+
+  @override
+  bool get wantKeepAlive => true;
 }