Merge branch 'fix'

lib/main.dart

@@ -60,6 +60,7 @@ void main() async {
       systemNavigationBarColor: Colors.transparent,
       systemNavigationBarDividerColor: Colors.transparent,
       statusBarColor: Colors.transparent,
+      systemNavigationBarContrastEnforced: false,
     ));
   }
 

lib/pages/home/controller.dart

@@ -8,7 +8,7 @@ import 'package:pilipala/utils/storage.dart';
 import '../../http/index.dart';
 
 class HomeController extends GetxController with GetTickerProviderStateMixin {
-  bool flag = false;
+  bool flag = true;
   late RxList tabs = [].obs;
   RxInt initialIndex = 1.obs;
   late TabController tabController;

lib/pages/main/view.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/dynamic_badge_mode.dart';
@@ -127,6 +128,14 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
         MediaQuery.sizeOf(context).width * 9 / 16;
     localCache.put('sheetHeight', sheetHeight);
     localCache.put('statusBarHeight', statusBarHeight);
+
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.transparent,
+        systemNavigationBarIconBrightness:
+            Get.isDarkMode ? Brightness.light : Brightness.dark,
+      ),
+    );
     return PopScope(
       canPop: false,
       onPopInvoked: (bool didPop) async {

lib/pages/video/detail/controller.dart

@@ -675,7 +675,6 @@ class VideoDetailController extends GetxController
   @override
   void onClose() {
     super.onClose();
-    plPlayerController.dispose();
     tabCtr.removeListener(() {
       onTabChanged();
     });

lib/pages/video/detail/view.dart

@@ -511,6 +511,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       exitFullScreen();
     }
 
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.transparent,
+        systemNavigationBarIconBrightness:
+            Get.isDarkMode ? Brightness.light : Brightness.dark,
+      ),
+    );
+
     Widget buildLoadingWidget() {
       return Center(child: Lottie.asset('assets/loading.json', width: 200));
     }
@@ -605,11 +613,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                     backgroundColor: Colors.black,
                     elevation: 0,
                     scrolledUnderElevation: 0,
-                    systemOverlayStyle: Get.isDarkMode
-                        ? SystemUiOverlayStyle.light
-                        : snapshot.data!.toDouble() > kToolbarHeight
-                            ? SystemUiOverlayStyle.dark
-                            : SystemUiOverlayStyle.light,
                   );
                 }),
               ),

lib/plugin/pl_player/controller.dart

@@ -1045,6 +1045,14 @@ class PlPlayerController {
 
   /// 缓存本次弹幕选项
   cacheDanmakuOption() {
+    final cache = GlobalDataCache();
+    cache.blockTypes = blockTypes;
+    cache.showArea = showArea;
+    cache.opacityVal = opacityVal;
+    cache.fontSizeVal = fontSizeVal;
+    cache.danmakuDurationVal = danmakuDurationVal;
+    cache.strokeWidth = strokeWidth;
+
     localCache.put(LocalCacheKey.danmakuBlockType, blockTypes);
     localCache.put(LocalCacheKey.danmakuShowArea, showArea);
     localCache.put(LocalCacheKey.danmakuOpacity, opacityVal);

lib/utils/cache_manage.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 
@@ -50,13 +51,17 @@ class CacheManage {
   Future<double> getTotalSizeOfFilesInDir(final FileSystemEntity file) async {
     if (file is File) {
       int length = await file.length();
-      return double.parse(length.toString());
+      return length.toDouble();
     }
     if (file is Directory) {
-      final List<FileSystemEntity> children = file.listSync();
       double total = 0;
-      for (final FileSystemEntity child in children) {
-        total += await getTotalSizeOfFilesInDir(child);
+      try {
+        await for (final FileSystemEntity child in file.list()) {
+          total += await getTotalSizeOfFilesInDir(child);
+        }
+      } catch (e) {
+        // 处理错误，例如记录日志或显示错误消息
+        print('读取目录时出错: $e');
       }
       return total;
     }
@@ -77,16 +82,17 @@ class CacheManage {
 
   // 清除缓存
   Future<bool> clearCacheAll() async {
-    bool cleanStatus = await SmartDialog.show(
-      useSystem: true,
-      animationType: SmartAnimationType.centerFade_otherSlide,
+    bool? cleanStatus = await showDialog<bool>(
+      context: Get.context!,
       builder: (BuildContext context) {
         return AlertDialog(
           title: const Text('提示'),
           content: const Text('该操作将清除图片及网络请求缓存数据，确认清除？'),
           actions: [
             TextButton(
-              onPressed: (() => {SmartDialog.dismiss()}),
+              onPressed: () {
+                Navigator.of(context).pop(false);
+              },
               child: Text(
                 '取消',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),
@@ -94,40 +100,45 @@ class CacheManage {
             ),
             TextButton(
               onPressed: () async {
-                SmartDialog.dismiss();
-                SmartDialog.showLoading(msg: '正在清除...');
-                try {
-                  // 清除缓存 图片缓存
-                  await clearLibraryCache();
-                  SmartDialog.dismiss().then((res) {
-                    SmartDialog.showToast('清除完成');
-                  });
-                } catch (err) {
-                  SmartDialog.dismiss();
-                  SmartDialog.showToast(err.toString());
-                }
+                Navigator.of(context).pop(true);
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
-    ).then((res) {
-      return true;
-    });
-    return cleanStatus;
+    );
+    if (cleanStatus != null && cleanStatus) {
+      SmartDialog.showLoading(msg: '正在清除...');
+      try {
+        // 清除缓存 图片缓存
+        await clearLibraryCache();
+        SmartDialog.dismiss().then((res) {
+          SmartDialog.showToast('清除完成');
+        });
+      } catch (err) {
+        SmartDialog.dismiss();
+        SmartDialog.showToast(err.toString());
+      }
+    }
+    return cleanStatus!;
   }
 
   /// 清除 Documents 目录下的 DioCache.db
-  Future clearApplicationCache() async {
-    Directory directory = await getApplicationDocumentsDirectory();
-    if (directory.existsSync()) {
-      String dioCacheFileName =
-          '${directory.path}${Platform.pathSeparator}DioCache.db';
-      var dioCacheFile = File(dioCacheFileName);
-      if (dioCacheFile.existsSync()) {
-        dioCacheFile.delete();
+  Future<void> clearApplicationCache() async {
+    try {
+      Directory directory = await getApplicationDocumentsDirectory();
+      if (directory.existsSync()) {
+        String dioCacheFileName =
+            '${directory.path}${Platform.pathSeparator}DioCache.db';
+        File dioCacheFile = File(dioCacheFileName);
+        if (await dioCacheFile.exists()) {
+          await dioCacheFile.delete();
+        }
       }
+    } catch (e) {
+      // 处理错误，例如记录日志或显示错误消息
+      print('清除缓存时出错: $e');
     }
   }