From c91cfedfe2e95c3fcd52ce60050ddae0cca9bc60 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sun, 17 Sep 2023 12:53:37 +0800
Subject: [PATCH] =?UTF-8?q?mod:=20=E7=9B=B4=E6=92=AD=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91&=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/live/controller.dart        |  6 +++---
 lib/pages/live/view.dart              | 12 ++++++++----
 lib/pages/live/widgets/live_item.dart |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart
index 8cdf53a7..28c34f3e 100644
--- a/lib/pages/live/controller.dart
+++ b/lib/pages/live/controller.dart
@@ -25,9 +25,9 @@ class LiveController extends GetxController {
 
   // 获取推荐
   Future queryLiveList(type) async {
-    if (type == 'init') {
-      _currentPage = 1;
-    }
+    // if (type == 'init') {
+    //   _currentPage = 1;
+    // }
     var res = await LiveHttp.liveList(
       pn: _currentPage,
     );
diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
index 2698c2db..fc29dea7 100644
--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@@ -21,11 +21,15 @@ class LivePage extends StatefulWidget {
   State<LivePage> createState() => _LivePageState();
 }
 
-class _LivePageState extends State<LivePage> {
+class _LivePageState extends State<LivePage>
+    with AutomaticKeepAliveClientMixin {
   final LiveController _liveController = Get.put(LiveController());
   late Future _futureBuilderFuture;
   late ScrollController scrollController;
 
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void initState() {
     super.initState();
@@ -37,7 +41,7 @@ class _LivePageState extends State<LivePage> {
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('my-throttler', const Duration(seconds: 1), () {
+          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
             _liveController.isLoadingMore = true;
             _liveController.onLoad();
           });
@@ -144,9 +148,9 @@ class _LivePageState extends State<LivePage> {
     return SliverGrid(
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
         // 行间距
-        mainAxisSpacing: StyleString.cardSpace + 4,
+        mainAxisSpacing: StyleString.safeSpace,
         // 列间距
-        crossAxisSpacing: StyleString.cardSpace + 4,
+        crossAxisSpacing: StyleString.safeSpace,
         // 列数
         crossAxisCount: crossAxisCount,
         mainAxisExtent:
diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart
index 48a4356e..6160d721 100644
--- a/lib/pages/live/widgets/live_item.dart
+++ b/lib/pages/live/widgets/live_item.dart
@@ -24,7 +24,7 @@ class LiveCardV extends StatelessWidget {
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(liveItem.roomId);
     return Card(
-      elevation: crossAxisCount == 1 ? 0 : 1,
+      elevation: 0,
       clipBehavior: Clip.hardEdge,
       margin: EdgeInsets.zero,
       child: GestureDetector(
@@ -102,7 +102,7 @@ class LiveContent extends StatelessWidget {
       child: Padding(
         padding: crossAxisCount == 1
             ? const EdgeInsets.fromLTRB(9, 9, 9, 4)
-            : const EdgeInsets.fromLTRB(9, 8, 9, 8),
+            : const EdgeInsets.fromLTRB(5, 8, 5, 4),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,