From 64292d523f26bd679447d1d34f5c3c51087c8760 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Mon, 18 Mar 2024 22:13:15 +0800
Subject: [PATCH 1/3] fix: player fit rebuild

---
 lib/plugin/pl_player/view.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index 0b2e652e..02f442d4 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -346,6 +346,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       children: <Widget>[
         Obx(
           () => Video(
+            key: ValueKey(_.videoFit.value),
             controller: videoController,
             controls: NoVideoControls,
             pauseUponEnteringBackgroundMode: !enableBackgroundPlay,

From 710361caeac2f3aa155fad8d8a2633890d01be10 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Wed, 20 Mar 2024 23:21:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/http/interceptor.dart         | 12 ++++++++----
 lib/pages/history/controller.dart |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart
index 362ff17a..fbc60ddf 100644
--- a/lib/http/interceptor.dart
+++ b/lib/http/interceptor.dart
@@ -45,10 +45,14 @@ class ApiInterceptor extends Interceptor {
   void onError(DioException err, ErrorInterceptorHandler handler) async {
     // 处理网络请求错误
     // handler.next(err);
-    SmartDialog.showToast(
-      await dioError(err),
-      displayType: SmartToastType.onlyRefresh,
-    );
+    String url = err.requestOptions.uri.toString();
+    print('🌹🌹ApiInterceptor: $url');
+    if (!url.contains('heartBeat')) {
+      SmartDialog.showToast(
+        await dioError(err),
+        displayType: SmartToastType.onlyRefresh,
+      );
+    }
     super.onError(err, handler);
   }
 
diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart
index e7822cd9..a1f18113 100644
--- a/lib/pages/history/controller.dart
+++ b/lib/pages/history/controller.dart
@@ -88,8 +88,10 @@ class HistoryController extends GetxController {
   // 观看历史暂停状态
   Future historyStatus() async {
     var res = await UserHttp.historyStatus();
-    pauseStatus.value = res.data['data'];
-    localCache.put(LocalCacheKey.historyPause, res.data['data']);
+    if (res.data['code'] == 0) {
+      pauseStatus.value = res.data['data'];
+      localCache.put(LocalCacheKey.historyPause, res.data['data']);
+    }
   }
 
   // 清空观看历史

From 6d276fce4c01e6a24d7abcd8313a0b653916c777 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Thu, 21 Mar 2024 00:03:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=AA=92=E4=BD=93=E5=BA=93=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/media/view.dart | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart
index c3bad4b9..460c5648 100644
--- a/lib/pages/media/view.dart
+++ b/lib/pages/media/view.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/main/index.dart';
@@ -102,7 +103,11 @@ class _MediaPageState extends State<MediaPage>
             ],
             Obx(() => mediaController.userLogin.value
                 ? favFolder(mediaController, context)
-                : const SizedBox())
+                : const SizedBox()),
+            SizedBox(
+              height: MediaQuery.of(context).padding.bottom +
+                  kBottomNavigationBarHeight,
+            )
           ],
         ),
       ),