mod: merge main

lib/pages/hot/controller.dart

@@ -1,8 +1,6 @@
-import 'package:flutter/animation.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
+import 'package:flutter/material.dart';
+import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/model_hot_video_item.dart';
 
 class HotController extends GetxController {
@@ -14,31 +12,24 @@ class HotController extends GetxController {
   bool flag = false;
   OverlayEntry? popupDialog;
 
-  @override
-  void onInit() {
-    super.onInit();
-    queryHotFeed('init');
-  }
-
   // 获取推荐
   Future queryHotFeed(type) async {
-    var res = await Request().get(
-      Api.hotList,
-      data: {'pn': _currentPage, 'ps': _count},
+    var res = await VideoHttp.hotVideoList(
+      pn: _currentPage,
+      ps: _count,
     );
-    List<HotVideoItemModel> list = [];
-    for (var i in res.data['data']['list']) {
-      list.add(HotVideoItemModel.fromJson(i));
+    if (res['status']) {
+      if (type == 'init') {
+        videoList.value = res['data'];
+      } else if (type == 'onRefresh') {
+        videoList.insertAll(0, res['data']);
+      } else if (type == 'onLoad') {
+        videoList.addAll(res['data']);
+      }
+      _currentPage += 1;
     }
-    if (type == 'init') {
-      videoList.value = list;
-    } else if (type == 'onRefresh') {
-      videoList.insertAll(0, list);
-    } else if (type == 'onLoad') {
-      videoList.addAll(list);
-    }
-    _currentPage += 1;
     isLoadingMore = false;
+    return res;
   }
 
   // 下拉刷新

lib/pages/hot/view.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/pages/hot/controller.dart';
 import 'package:pilipala/pages/home/widgets/app_bar.dart';
@@ -16,6 +18,7 @@ class HotPage extends StatefulWidget {
 class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
   final HotController _hotController = Get.put(HotController());
   List videoList = [];
+  Future? _futureBuilderFuture;
 
   @override
   bool get wantKeepAlive => true;
@@ -23,11 +26,7 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
   @override
   void initState() {
     super.initState();
-    _hotController.videoList.listen((value) {
-      videoList = value;
-      setState(() {});
-    });
-
+    _futureBuilderFuture = _hotController.queryHotFeed('init');
     _hotController.scrollController.addListener(
       () {
         if (_hotController.scrollController.position.pixels >=
@@ -54,20 +53,46 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
           controller: _hotController.scrollController,
           slivers: [
             const HomeAppBar(),
-            SliverList(
-                delegate: SliverChildBuilderDelegate((context, index) {
-              return VideoCardH(
-                videoItem: videoList[index],
-                longPress: () {
-                  _hotController.popupDialog =
-                      _createPopupDialog(videoList[index]);
-                  Overlay.of(context).insert(_hotController.popupDialog!);
-                },
-                longPressEnd: () {
-                  _hotController.popupDialog?.remove();
-                },
-              );
-            }, childCount: videoList.length)),
+            FutureBuilder(
+              future: _futureBuilderFuture,
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    return Obx(
+                      () => SliverList(
+                        delegate: SliverChildBuilderDelegate((context, index) {
+                          return VideoCardH(
+                            videoItem: _hotController.videoList[index],
+                            longPress: () {
+                              _hotController.popupDialog = _createPopupDialog(
+                                  _hotController.videoList[index]);
+                              Overlay.of(context)
+                                  .insert(_hotController.popupDialog!);
+                            },
+                            longPressEnd: () {
+                              _hotController.popupDialog?.remove();
+                            },
+                          );
+                        }, childCount: _hotController.videoList.length),
+                      ),
+                    );
+                  } else {
+                    return HttpError(
+                      errMsg: data['msg'],
+                      fn: () => setState(() {}),
+                    );
+                  }
+                } else {
+                  // 骨架屏
+                  return SliverList(
+                    delegate: SliverChildBuilderDelegate((context, index) {
+                      return const VideoCardHSkeleton();
+                    }, childCount: 5),
+                  );
+                }
+              },
+            ),
             SliverToBoxAdapter(
               child: SizedBox(
                 height: MediaQuery.of(context).padding.bottom + 10,