fix(优化代码)

liuchuancong · liuchuancong · commit c66a5bd1b678 · 2026-01-04T14:59:49.000+08:00
diff --git a/lib/common/global/initialized.dart b/lib/common/global/initialized.dart
@@ -79,6 +79,7 @@ class AppInitializer {
       exit(0);
     }
     MediaKit.ensureInitialized();
+    CustomCacheManager.init();
     await SupaBaseManager.getInstance().initial();
 
     if (PlatformUtils.isDesktop) {
diff --git a/lib/common/global/platform/desktop_manager.dart b/lib/common/global/platform/desktop_manager.dart
@@ -103,12 +103,12 @@ class DesktopManager {
     return Obx(() {
       bool fullscreen = GlobalPlayerState.to.isFullscreen.value;
       bool isPipModel = GlobalPlayerState.to.isPipMode.value;
-      if (!PlatformUtils.isWindows || isPipModel) {
+      if (!PlatformUtils.isWindows) {
         return child ?? const SizedBox.shrink();
       }
       return Column(
         children: [
-          if (!fullscreen) const CustomTitleBar(),
+          if (!fullscreen && !isPipModel) const CustomTitleBar(),
           if (child != null) Expanded(child: child),
         ],
       );
diff --git a/lib/common/utils/cache_manager.dart b/lib/common/utils/cache_manager.dart
@@ -1,37 +1,92 @@
-import 'package:file/local.dart';
+import 'dart:io';
+import 'dart:developer';
+import 'package:rxdart/rxdart.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 class CustomCacheManager {
-  static const key = 'customCacheKey';
+  static const String _key = 'customCacheKey';
 
-  static CacheManager instance = CacheManager(
+  static final CacheManager instance = CacheManager(
     Config(
-      key,
+      _key,
       stalePeriod: const Duration(days: 1),
-      maxNrOfCacheObjects: 20,
-      repo: JsonCacheInfoRepository(databaseName: key),
-      fileSystem: IOFileSystem(key),
+      maxNrOfCacheObjects: 2000,
+      repo: JsonCacheInfoRepository(databaseName: _key),
+      fileSystem: IOFileSystem(_key),
       fileService: HttpFileService(),
     ),
   );
 
-  static Future<double> cacheSize() async {
-    var baseDir = await getTemporaryDirectory();
-    var path = p.join(baseDir.path, key);
+  static final _sizeController = BehaviorSubject<double>.seeded(0.0);
+  static Stream<double> get cacheSizeStream => _sizeController.stream;
 
-    var fs = const LocalFileSystem();
-    var directory = fs.directory((path));
-    return (await directory.stat()).size / 8 / 1000;
+  static final _updateTrigger = PublishSubject<void>();
+
+  static void init() {
+    _updateTrigger
+        .throttleTime(const Duration(seconds: 2), trailing: true, leading: true)
+        .asyncMap((_) => _calculateSize())
+        .listen((size) {
+          _sizeController.add(size);
+          log('缓存大小已更新: ${size.toStringAsFixed(2)} MB');
+        });
+
+    // 初始统计一次
+    notifyUpdate();
+  }
+
+  static void notifyUpdate() => _updateTrigger.add(null);
+
+  static Future<double> _calculateSize() async {
+    final baseDir = await getTemporaryDirectory();
+    int totalBytes = 0;
+
+    final fileDir = Directory(p.join(baseDir.path, _key));
+    if (await fileDir.exists()) {
+      await for (var file in fileDir.list(recursive: true)) {
+        if (file is File) totalBytes += await file.length();
+      }
+    }
+
+    final dbFile = File(p.join(baseDir.path, '$_key.json'));
+    if (await dbFile.exists()) {
+      totalBytes += await dbFile.length();
+    }
+
+    // 转换为 MB (1024 * 1024)
+    return totalBytes / (1024 * 1024);
   }
 
+  /// 彻底清理缓存：清理数据库 + 物理删除文件夹
   static Future<void> clearCache() async {
-    var baseDir = await getTemporaryDirectory();
-    var path = p.join(baseDir.path, key);
+    try {
+      await instance.emptyCache();
+
+      // 2. 物理删除残留文件夹和 JSON 数据库文件
+      final baseDir = await getTemporaryDirectory();
+      final dirPath = p.join(baseDir.path, _key);
+      final dbPath = p.join(baseDir.path, '$_key.json');
+
+      final dir = Directory(dirPath);
+      if (await dir.exists()) await dir.delete(recursive: true);
+
+      final db = File(dbPath);
+      if (await db.exists()) await db.delete();
+
+      log('清除缓存成功');
+
+      // 立即重置流状态
+      _sizeController.add(0.0);
+    } catch (e) {
+      log('清理缓存失败: $e');
+    }
+  }
 
-    var fs = const LocalFileSystem();
-    var directory = fs.directory((path));
-    await directory.delete(recursive: true);
+  /// 销毁资源
+  static void dispose() {
+    _sizeController.close();
+    _updateTrigger.close();
   }
 }
diff --git a/lib/modules/live_play/live_play_page.dart b/lib/modules/live_play/live_play_page.dart
@@ -20,19 +20,52 @@ class LivePlayPage extends GetView<LivePlayController> {
 
   @override
   Widget build(BuildContext context) {
-    if (settings.enableScreenKeepOn.value) {
-      WakelockPlus.toggle(enable: settings.enableScreenKeepOn.value);
-    }
     return Obx(() {
-      if (SwitchableGlobalPlayer().isInPip.value) {
-        return SwitchableGlobalPlayer().buildPiPOverlay();
-      }
-      if (controller.screenMode.value == VideoMode.normal) {
-        return buildNormalPlayerView(context);
-      } else if (controller.screenMode.value == VideoMode.widescreen) {
-        return buildVideoPlayer();
+      _updateWakelock();
+      final isInPip = SwitchableGlobalPlayer().isInPip.value;
+      final mode = controller.screenMode.value;
+
+      return Container(
+        color: Colors.black,
+        child: AnimatedSwitcher(
+          duration: const Duration(milliseconds: 500),
+          child: _buildConstrainedChild(isInPip, mode, context),
+          layoutBuilder: (currentChild, previousChildren) {
+            return Stack(
+              alignment: Alignment.center,
+              children: <Widget>[...previousChildren, if (currentChild != null) currentChild],
+            );
+          },
+        ),
+      );
+    });
+  }
+
+  Widget _buildConstrainedChild(bool isInPip, VideoMode mode, BuildContext context) {
+    if (isInPip) {
+      return Theme(
+        data: ThemeData.dark(),
+        child: Container(
+          key: const ValueKey('pip'),
+          color: Colors.transparent,
+          child: SwitchableGlobalPlayer().buildPiPOverlay(),
+        ),
+      );
+    }
+
+    if (mode == VideoMode.normal) {
+      return Container(key: const ValueKey('normal'), color: Colors.black, child: buildNormalPlayerView(context));
+    }
+
+    return Container(key: const ValueKey('widescreen'), color: Colors.black, child: buildVideoPlayer());
+  }
+
+  void _updateWakelock() {
+    final shouldKeepOn = settings.enableScreenKeepOn.value;
+    WakelockPlus.enabled.then((isEnabled) {
+      if (isEnabled != shouldKeepOn) {
+        WakelockPlus.toggle(enable: shouldKeepOn);
       }
-      return buildVideoPlayer();
     });
   }
 
diff --git a/lib/modules/settings/settings_page.dart b/lib/modules/settings/settings_page.dart
@@ -80,6 +80,17 @@ class SettingsPage extends GetView<SettingsService> {
             subtitle: Text(S.of(context).change_language_subtitle),
             onTap: showLanguageSelecterDialog,
           ),
+          StreamBuilder<double>(
+            stream: CustomCacheManager.cacheSizeStream,
+            builder: (context, snapshot) {
+              final size = snapshot.data ?? 0.0;
+              return ListTile(
+                leading: const Icon(Icons.download_for_offline_rounded, size: 32),
+                title: Text("当前缓存大小: ${size.toStringAsFixed(2)} MB"),
+                onTap: CustomCacheManager.clearCache,
+              );
+            },
+          ),
           ListTile(
             leading: const Icon(Icons.backup_rounded, size: 32),
             title: Text(S.of(context).backup_recover),
@@ -113,7 +124,7 @@ class SettingsPage extends GetView<SettingsService> {
               onChanged: (bool value) => controller.enableCodec.value = value,
             ),
           ),
-          if (Platform.isAndroid)
+          if (Platform.isAndroid && controller.videoPlayerIndex.value == 0)
             Obx(
               () => SwitchListTile(
                 title: Text('兼容模式'),
@@ -162,6 +173,7 @@ class SettingsPage extends GetView<SettingsService> {
               onChanged: (bool value) => controller.enableFullScreenDefault.value = value,
             ),
           ),
+
           Obx(
             () => ListTile(
               title: Text(S.of(context).prefer_resolution),
@@ -170,32 +182,34 @@ class SettingsPage extends GetView<SettingsService> {
               onTap: showPreferResolutionSelectorDialog,
             ),
           ),
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-            child: Text("播放器高级设置", style: Get.textTheme.titleMedium),
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-            child: Text.rich(
-              TextSpan(
-                text: "请勿随意修改以下设置，除非你知道自己在做什么。\n在修改以下设置前，你应该先查阅",
-                children: [
-                  WidgetSpan(
-                    child: GestureDetector(
-                      onTap: () {
-                        launchUrlString("https://mpv.io/manual/stable/#video-output-drivers");
-                      },
-                      child: const Text(
-                        "MPV的文档",
-                        style: TextStyle(color: Colors.blue, fontSize: 12, decoration: TextDecoration.underline),
+          if (Platform.isAndroid && controller.videoPlayerIndex.value == 0)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+              child: Text("播放器高级设置", style: Get.textTheme.titleMedium),
+            ),
+          if (Platform.isAndroid && controller.videoPlayerIndex.value == 0)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+              child: Text.rich(
+                TextSpan(
+                  text: "请勿随意修改以下设置，除非你知道自己在做什么。\n在修改以下设置前，你应该先查阅",
+                  children: [
+                    WidgetSpan(
+                      child: GestureDetector(
+                        onTap: () {
+                          launchUrlString("https://mpv.io/manual/stable/#video-output-drivers");
+                        },
+                        child: const Text(
+                          "MPV的文档",
+                          style: TextStyle(color: Colors.blue, fontSize: 12, decoration: TextDecoration.underline),
+                        ),
                       ),
                     ),
-                  ),
-                ],
+                  ],
+                ),
+                style: const TextStyle(fontSize: 12, color: Colors.grey),
               ),
-              style: const TextStyle(fontSize: 12, color: Colors.grey),
             ),
-          ),
           SettingsCard(
             child: Column(
               children: [

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ class AppInitializer {`
`79`	`79`	`exit(0);`
`80`	`80`	`}`
`81`	`81`	`MediaKit.ensureInitialized();`
	`82`	`+ CustomCacheManager.init();`
`82`	`83`	`await SupaBaseManager.getInstance().initial();`
`83`	`84`
`84`	`85`	`if (PlatformUtils.isDesktop) {`