From b4b64d9864d4da033b0bc3823eda88ac0059d77f Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sat, 16 Dec 2023 20:57:18 +0800
Subject: [PATCH 1/3] fix: duration null error

---
 lib/plugin/pl_player/controller.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 8f09d0ca..65f3fbca 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -651,7 +651,9 @@ class PlPlayerController {
     // screenManager.setOverlays(false);
 
     /// 临时fix _duration.value丢失
-    _duration.value = duration;
+    if (duration != null) {
+      _duration.value = duration;
+    }
     audioSessionHandler.setActive(true);
   }
 

From 172ea0fbb6dbfe736c948ba77c10245c19ace060 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sat, 16 Dec 2023 21:02:16 +0800
Subject: [PATCH 2/3] fix: tabbar alignment

---
 lib/pages/home/view.dart         | 1 +
 lib/pages/searchResult/view.dart | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
index 3cdf81c7..a649aaa4 100644
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -65,6 +65,7 @@ class _HomePageState extends State<HomePage>
                 dividerColor: Colors.transparent,
                 enableFeedback: true,
                 splashBorderRadius: BorderRadius.circular(10),
+                tabAlignment: TabAlignment.center,
                 onTap: (value) {
                   feedBack();
                   if (_homeController.initialIndex == value) {
diff --git a/lib/pages/searchResult/view.dart b/lib/pages/searchResult/view.dart
index f2efb33a..ceb77190 100644
--- a/lib/pages/searchResult/view.dart
+++ b/lib/pages/searchResult/view.dart
@@ -82,6 +82,7 @@ class _SearchResultPageState extends State<SearchResultPage>
                 labelStyle: const TextStyle(fontSize: 13),
                 dividerColor: Colors.transparent,
                 unselectedLabelColor: Theme.of(context).colorScheme.outline,
+                tabAlignment: TabAlignment.start,
                 onTap: (index) {
                   if (index == _searchResultController!.tabIndex) {
                     Get.find<SearchPanelController>(

From f135a2beae1bd79a14d2478884f83ce27db63904 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sat, 16 Dec 2023 21:37:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=A4=96=E8=A7=82=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=B6=85=E8=BF=873=E5=88=97=E6=97=A0=E6=B3=95=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=20issues=20#271?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/rcmd/view.dart | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart
index a0f867f7..1236ea33 100644
--- a/lib/pages/rcmd/view.dart
+++ b/lib/pages/rcmd/view.dart
@@ -87,6 +87,7 @@ class _RcmdPageState extends State<RcmdPage>
         },
         child: CustomScrollView(
           controller: _rcmdController.scrollController,
+          physics: const AlwaysScrollableScrollPhysics(),
           slivers: [
             SliverPadding(
               padding:
@@ -157,11 +158,10 @@ class _RcmdPageState extends State<RcmdPage>
     //   crossAxisCount = 1;
     // }
     int crossAxisCount = ctr.crossAxisCount.value;
-    double mainAxisExtent =
-        (Get.size.width / crossAxisCount / StyleString.aspectRatio) +
-            (crossAxisCount == 1
-                ? 68
-                : 86 * MediaQuery.of(context).textScaleFactor);
+    double mainAxisExtent = (Get.size.width /
+            crossAxisCount /
+            StyleString.aspectRatio) +
+        (crossAxisCount == 1 ? 68 : MediaQuery.textScalerOf(context).scale(86));
     return SliverGrid(
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
         // 行间距
@@ -196,8 +196,8 @@ class _RcmdPageState extends State<RcmdPage>
 }
 
 class LoadingMore extends StatelessWidget {
-  dynamic ctr;
-  LoadingMore({super.key, this.ctr});
+  final dynamic ctr;
+  const LoadingMore({super.key, this.ctr});
 
   @override
   Widget build(BuildContext context) {