mod: merge main

2023-05-15 09:52:09 +08:00
parent b382377933 351cc0a850
commit 1c1b951df7
141 changed files with 7011 additions and 363 deletions
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@ -1,7 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
+import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/model_rec_video_item.dart';

 class HomeController extends GetxController {
@ -17,28 +16,27 @@ class HomeController extends GetxController {
  @override
  void onInit() {
    super.onInit();
-    queryRcmdFeed('init');
+    // queryRcmdFeed('init');
  }

  // 获取推荐
  Future queryRcmdFeed(type) async {
-    var res = await Request().get(
-      Api.recommendList,
-      data: {'feed_version': "V3", 'ps': count, 'fresh_idx': _currentPage},
+    var res = await VideoHttp.rcmdVideoList(
+      ps: count,
+      freshIdx: _currentPage,
    );
-    List<RecVideoItemModel> list = [];
-    for (var i in res.data['data']['item']) {
-      list.add(RecVideoItemModel.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;
  }

  // 下拉刷新
@ -48,7 +46,6 @@ class HomeController extends GetxController {

  // 上拉加载
  Future onLoad() async {
-    await Future.delayed(const Duration(milliseconds: 500));
    queryRcmdFeed('onLoad');
  }

--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_card_v.dart';
 import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/video_card_v.dart';
 import './controller.dart';
 import 'package:pilipala/common/constants.dart';
@ -18,6 +19,7 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends State<HomePage>
    with AutomaticKeepAliveClientMixin {
  final HomeController _homeController = Get.put(HomeController());
+  Future? _futureBuilderFuture;
  List videoList = [];

  @override
@ -26,6 +28,7 @@ class _HomePageState extends State<HomePage>
  @override
  void initState() {
    super.initState();
+    _futureBuilderFuture = _homeController.queryRcmdFeed('init');
    _homeController.videoList.listen((value) {
      videoList = value;
      setState(() {});
@ -71,37 +74,25 @@ class _HomePageState extends State<HomePage>
                  ? EdgeInsets.zero
                  : const EdgeInsets.fromLTRB(
                      StyleString.cardSpace, 0, StyleString.cardSpace, 8),
-              sliver: SliverGrid(
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                    // 行间距
-                    mainAxisSpacing: StyleString.cardSpace,
-                    // 列间距
-                    crossAxisSpacing: StyleString.cardSpace,
-                    // 列数
-                    crossAxisCount: _homeController.crossAxisCount,
-                    mainAxisExtent: MediaQuery.of(context).size.width /
-                            _homeController.crossAxisCount /
-                            StyleString.aspectRatio +
-                        72),
-                delegate: SliverChildBuilderDelegate(
-                  (BuildContext context, int index) {
-                    return videoList.isNotEmpty
-                        ? VideoCardV(
-                            videoItem: videoList[index],
-                            longPress: () {
-                              _homeController.popupDialog =
-                                  _createPopupDialog(videoList[index]);
-                              Overlay.of(context)
-                                  .insert(_homeController.popupDialog!);
-                            },
-                            longPressEnd: () {
-                              _homeController.popupDialog?.remove();
-                            },
-                          )
-                        : const VideoCardVSkeleton();
-                  },
-                  childCount: videoList.isNotEmpty ? videoList.length : 10,
-                ),
+              sliver: FutureBuilder(
+                future: _futureBuilderFuture,
+                builder: (context, snapshot) {
+                  if (snapshot.connectionState == ConnectionState.done) {
+                    Map data = snapshot.data as Map;
+                    if (data['status']) {
+                      return Obx(() => contentGrid(
+                          _homeController, _homeController.videoList));
+                    } else {
+                      return HttpError(
+                        errMsg: data['msg'],
+                        fn: () => setState(() {}),
+                      );
+                    }
+                  } else {
+                    // 骨架屏
+                    return contentGrid(_homeController, []);
+                  }
+                },
              ),
            ),
            const LoadingMore()
@ -114,8 +105,44 @@ class _HomePageState extends State<HomePage>

  OverlayEntry _createPopupDialog(videoItem) {
    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        child: OverlayPop(videoItem: videoItem),
+        builder: (context) => AnimatedDialog(
+              child: OverlayPop(videoItem: videoItem),
+            ));
+  }
+
+  Widget contentGrid(ctr, videoList) {
+    return SliverGrid(
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        // 行间距
+        mainAxisSpacing: StyleString.cardSpace,
+        // 列间距
+        crossAxisSpacing: StyleString.cardSpace,
+        // 列数
+        crossAxisCount: ctr.crossAxisCount,
+        mainAxisExtent: MediaQuery.of(context).size.width /
+                ctr.crossAxisCount /
+                StyleString.aspectRatio +
+            70,
+      ),
+      delegate: SliverChildBuilderDelegate(
+        (BuildContext context, int index) {
+          return videoList!.isNotEmpty
+              ?
+              // VideoCardV(videoItem: videoList![index])
+              VideoCardV(
+                  videoItem: videoList[index],
+                  longPress: () {
+                    _homeController.popupDialog =
+                        _createPopupDialog(videoList[index]);
+                    Overlay.of(context).insert(_homeController.popupDialog!);
+                  },
+                  longPressEnd: () {
+                    _homeController.popupDialog?.remove();
+                  },
+                )
+              : const VideoCardVSkeleton();
+        },
+        childCount: videoList!.isNotEmpty ? videoList!.length : 10,
      ),
    );
  }
--- a/lib/pages/home/widgets/app_bar.dart
+++ b/lib/pages/home/widgets/app_bar.dart
@ -1,5 +1,9 @@
 import 'dart:io';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/pages/mine/view.dart';

 class HomeAppBar extends StatelessWidget {
  const HomeAppBar({super.key});
@ -9,11 +13,7 @@ class HomeAppBar extends StatelessWidget {
    return SliverAppBar(
      // forceElevated: true,
      scrolledUnderElevation: 0,
-      toolbarHeight: Platform.isAndroid
-          ? (MediaQuery.of(context).padding.top + 6)
-          : Platform.isIOS
-              ? MediaQuery.of(context).padding.top - 2
-              : kToolbarHeight,
+      toolbarHeight: MediaQuery.of(context).padding.top,
      expandedHeight: kToolbarHeight + MediaQuery.of(context).padding.top,
      automaticallyImplyLeading: false,
      pinned: true,
@ -29,19 +29,26 @@ class HomeAppBar extends StatelessWidget {
                  title: const Text(
                    'PiLiPaLa',
                    style: TextStyle(
-                      fontSize: 18,
+                      fontSize: 20,
                      fontWeight: FontWeight.bold,
                      letterSpacing: 1,
+                      fontFamily: 'ArchivoNarrow',
                    ),
                  ),
                  actions: [
                    IconButton(
                      onPressed: () {},
-                      icon: const Icon(Icons.notifications_none_rounded),
+                      icon: const Icon(CupertinoIcons.search, size: 22),
                    ),
+                    // IconButton(
+                    //   onPressed: () {},
+                    //   icon: const Icon(CupertinoIcons.bell, size: 22),
+                    // ),
                    IconButton(
-                      onPressed: () {},
-                      icon: const Icon(Icons.search_rounded),
+                      onPressed: () {
+                        Get.bottomSheet(const MinePage());
+                      },
+                      icon: const Icon(CupertinoIcons.person, size: 22),
                    ),
                    const SizedBox(width: 10)
                  ],