Merge branch 'main' into fix

2024-06-02 01:15:47 +08:00
parent 2358ba42e1 251f0ed55d
commit 59304760f6
10 changed files with 293 additions and 245 deletions
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
    repositories {
        google()
        mavenCentral()
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -10,7 +10,6 @@ PODS:
  - connectivity_plus (0.0.1):
    - Flutter
    - FlutterMacOS
-    - ReachabilitySwift
  - device_info_plus (0.0.1):
    - Flutter
  - Flutter (1.0.0)
@ -41,7 +40,6 @@ PODS:
    - FlutterMacOS
  - permission_handler_apple (9.3.0):
    - Flutter
-  - ReachabilitySwift (5.0.0)
  - saver_gallery (0.0.1):
    - Flutter
  - screen_brightness_ios (0.1.0):
@ -101,7 +99,6 @@ SPEC REPOS:
  trunk:
    - FMDB
    - GT3Captcha-iOS
-    - ReachabilitySwift
    - Toast

 EXTERNAL SOURCES:
@ -167,9 +164,9 @@ SPEC CHECKSUMS:
  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
  auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
-  connectivity_plus: e2dad488011aeb593e219360e804c43cc1af5770
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
  flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
  flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
@ -182,7 +179,6 @@ SPEC CHECKSUMS:
  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
@ -190,11 +186,11 @@ SPEC CHECKSUMS:
  status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
  system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
  Toast: ec33c32b8688982cecc6348adeae667c1b9938da
-  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
-  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
+  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
  webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
-  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
+  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36

 PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be

--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/lib/main.dart
+++ b/lib/main.dart
@ -23,7 +23,7 @@ import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
 import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
+import 'package:media_kit/media_kit.dart';
 import 'package:pilipala/utils/recommend_filter.dart';
 import 'package:catcher_2/catcher_2.dart';
 import './services/loggeer.dart';
@ -31,59 +31,42 @@ import './services/loggeer.dart';
 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
  MediaKit.ensureInitialized();
-  SystemChrome.setPreferredOrientations(
-          [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
-      .then((_) async {
-    await GStrorage.init();
-    await setupServiceLocator();
-    clearLogs();
-    Request();
-    await Request.setCookie();
-    RecommendFilter();
+  await SystemChrome.setPreferredOrientations(
+      [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
+  await GStrorage.init();
+  await setupServiceLocator();
+  clearLogs();
+  Request();
+  await Request.setCookie();

-    // 异常捕获 logo记录
-    final Catcher2Options debugConfig = Catcher2Options(
-      SilentReportMode(),
-      [
-        FileHandler(await getLogsPath()),
-        ConsoleHandler(
-          enableDeviceParameters: false,
-          enableApplicationParameters: false,
-        )
-      ],
-    );
+  // 异常捕获 logo记录
+  final Catcher2Options releaseConfig = Catcher2Options(
+    SilentReportMode(),
+    [FileHandler(await getLogsPath())],
+  );

-    final Catcher2Options releaseConfig = Catcher2Options(
-      SilentReportMode(),
-      [FileHandler(await getLogsPath())],
-    );
+  Catcher2(
+    releaseConfig: releaseConfig,
+    runAppFunction: () {
+      runApp(const MyApp());
+    },
+  );

-    Catcher2(
-      debugConfig: debugConfig,
-      releaseConfig: releaseConfig,
-      runAppFunction: () {
-        runApp(const MyApp());
-      },
-    );
-
-    // 小白条、导航栏沉浸
-    if (Platform.isAndroid) {
-      final androidInfo = await DeviceInfoPlugin().androidInfo;
-      if (androidInfo.version.sdkInt >= 29) {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-      }
-      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-        systemNavigationBarColor: Colors.transparent,
-        systemNavigationBarDividerColor: Colors.transparent,
-        statusBarColor: Colors.transparent,
-      ));
+  // 小白条、导航栏沉浸
+  if (Platform.isAndroid) {
+    final androidInfo = await DeviceInfoPlugin().androidInfo;
+    if (androidInfo.version.sdkInt >= 29) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
    }
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      systemNavigationBarColor: Colors.transparent,
+      systemNavigationBarDividerColor: Colors.transparent,
+      statusBarColor: Colors.transparent,
+    ));
+  }

-    Data.init();
-    GlobalData();
-    PiliSchame.init();
-    DisableBatteryOpt();
-  });
+  PiliSchame.init();
+  DisableBatteryOpt();
 }

 class MyApp extends StatelessWidget {
@ -124,6 +107,39 @@ class MyApp extends StatelessWidget {
      } catch (_) {}
    }

+    if (Platform.isAndroid) {
+      return AndroidApp(
+        brandColor: brandColor,
+        isDynamicColor: isDynamicColor,
+        currentThemeValue: currentThemeValue,
+        textScale: textScale,
+      );
+    } else {
+      return OtherApp(
+        brandColor: brandColor,
+        currentThemeValue: currentThemeValue,
+        textScale: textScale,
+      );
+    }
+  }
+}
+
+class AndroidApp extends StatelessWidget {
+  const AndroidApp({
+    super.key,
+    required this.brandColor,
+    required this.isDynamicColor,
+    required this.currentThemeValue,
+    required this.textScale,
+  });
+
+  final Color brandColor;
+  final bool isDynamicColor;
+  final ThemeType currentThemeValue;
+  final double textScale;
+
+  @override
+  Widget build(BuildContext context) {
    return DynamicColorBuilder(
      builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
        ColorScheme? lightColorScheme;
@ -143,96 +159,120 @@ class MyApp extends StatelessWidget {
            brightness: Brightness.dark,
          );
        }
-
-        // ThemeData themeData = ThemeData(
-        //   colorScheme: currentThemeValue == ThemeType.dark
-        //       ? darkColorScheme
-        //       : lightColorScheme,
-        // );
-
-        // // 小白条、导航栏沉浸
-        // if (Platform.isAndroid) {
-        //   List<String> versionParts = Platform.version.split('.');
-        //   int androidVersion = int.parse(versionParts[0]);
-        //   if (androidVersion >= 29) {
-        //     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-        //   }
-        //   SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-        //     systemNavigationBarColor: GlobalData().enableMYBar
-        //         ? const Color(0x00010000)
-        //         : themeData.canvasColor,
-        //     systemNavigationBarDividerColor: GlobalData().enableMYBar
-        //         ? const Color(0x00010000)
-        //         : themeData.canvasColor,
-        //     systemNavigationBarIconBrightness:
-        //         currentThemeValue == ThemeType.dark
-        //             ? Brightness.light
-        //             : Brightness.dark,
-        //     statusBarColor: Colors.transparent,
-        //   ));
-        // }
-
-        // 图片缓存
-        // PaintingBinding.instance.imageCache.maximumSizeBytes = 1000 << 20;
-        return GetMaterialApp(
-          title: 'PiliPala',
-          theme: ThemeData(
-            colorScheme: currentThemeValue == ThemeType.dark
-                ? darkColorScheme
-                : lightColorScheme,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: lightColorScheme.primary,
-              backgroundColor: lightColorScheme.secondaryContainer,
-              closeIconColor: lightColorScheme.secondary,
-              contentTextStyle: TextStyle(color: lightColorScheme.secondary),
-              elevation: 20,
-            ),
-            pageTransitionsTheme: const PageTransitionsTheme(
-              builders: <TargetPlatform, PageTransitionsBuilder>{
-                TargetPlatform.android: ZoomPageTransitionsBuilder(
-                  allowEnterRouteSnapshotting: false,
-                ),
-              },
-            ),
-          ),
-          darkTheme: ThemeData(
-            colorScheme: currentThemeValue == ThemeType.light
-                ? lightColorScheme
-                : darkColorScheme,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: darkColorScheme.primary,
-              backgroundColor: darkColorScheme.secondaryContainer,
-              closeIconColor: darkColorScheme.secondary,
-              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
-              elevation: 20,
-            ),
-          ),
-          localizationsDelegates: const [
-            GlobalCupertinoLocalizations.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-          ],
-          locale: const Locale("zh", "CN"),
-          supportedLocales: const [Locale("zh", "CN"), Locale("en", "US")],
-          fallbackLocale: const Locale("zh", "CN"),
-          getPages: Routes.getPages,
-          home: const MainApp(),
-          builder: (BuildContext context, Widget? child) {
-            return FlutterSmartDialog(
-              toastBuilder: (String msg) => CustomToast(msg: msg),
-              child: MediaQuery(
-                data: MediaQuery.of(context)
-                    .copyWith(textScaler: TextScaler.linear(textScale)),
-                child: child!,
-              ),
-            );
-          },
-          navigatorObservers: [
-            VideoDetailPage.routeObserver,
-            SearchPage.routeObserver,
-          ],
+        return BuildMainApp(
+          lightColorScheme: lightColorScheme,
+          darkColorScheme: darkColorScheme,
+          currentThemeValue: currentThemeValue,
+          textScale: textScale,
        );
      }),
    );
  }
 }
+
+class OtherApp extends StatelessWidget {
+  const OtherApp({
+    super.key,
+    required this.brandColor,
+    required this.currentThemeValue,
+    required this.textScale,
+  });
+
+  final Color brandColor;
+  final ThemeType currentThemeValue;
+  final double textScale;
+
+  @override
+  Widget build(BuildContext context) {
+    return BuildMainApp(
+      lightColorScheme: ColorScheme.fromSeed(
+        seedColor: brandColor,
+        brightness: Brightness.light,
+      ),
+      darkColorScheme: ColorScheme.fromSeed(
+        seedColor: brandColor,
+        brightness: Brightness.dark,
+      ),
+      currentThemeValue: currentThemeValue,
+      textScale: textScale,
+    );
+  }
+}
+
+class BuildMainApp extends StatelessWidget {
+  const BuildMainApp({
+    super.key,
+    required this.lightColorScheme,
+    required this.darkColorScheme,
+    required this.currentThemeValue,
+    required this.textScale,
+  });
+
+  final ColorScheme lightColorScheme;
+  final ColorScheme darkColorScheme;
+  final ThemeType currentThemeValue;
+  final double textScale;
+
+  @override
+  Widget build(BuildContext context) {
+    final SnackBarThemeData snackBarTheme = SnackBarThemeData(
+      actionTextColor: lightColorScheme.primary,
+      backgroundColor: lightColorScheme.secondaryContainer,
+      closeIconColor: lightColorScheme.secondary,
+      contentTextStyle: TextStyle(color: lightColorScheme.secondary),
+      elevation: 20,
+    );
+
+    return GetMaterialApp(
+      title: 'PiliPala',
+      theme: ThemeData(
+        colorScheme: currentThemeValue == ThemeType.dark
+            ? darkColorScheme
+            : lightColorScheme,
+        snackBarTheme: snackBarTheme,
+        pageTransitionsTheme: const PageTransitionsTheme(
+          builders: <TargetPlatform, PageTransitionsBuilder>{
+            TargetPlatform.android: ZoomPageTransitionsBuilder(
+              allowEnterRouteSnapshotting: false,
+            ),
+          },
+        ),
+      ),
+      darkTheme: ThemeData(
+        colorScheme: currentThemeValue == ThemeType.light
+            ? lightColorScheme
+            : darkColorScheme,
+        snackBarTheme: snackBarTheme,
+      ),
+      localizationsDelegates: const [
+        GlobalCupertinoLocalizations.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ],
+      locale: const Locale("zh", "CN"),
+      supportedLocales: const [Locale("zh", "CN"), Locale("en", "US")],
+      fallbackLocale: const Locale("zh", "CN"),
+      getPages: Routes.getPages,
+      home: const MainApp(),
+      builder: (BuildContext context, Widget? child) {
+        return FlutterSmartDialog(
+          toastBuilder: (String msg) => CustomToast(msg: msg),
+          child: MediaQuery(
+            data: MediaQuery.of(context)
+                .copyWith(textScaler: TextScaler.linear(textScale)),
+            child: child!,
+          ),
+        );
+      },
+      navigatorObservers: [
+        VideoDetailPage.routeObserver,
+        SearchPage.routeObserver,
+      ],
+      onInit: () {
+        RecommendFilter();
+        Data.init();
+        GlobalData();
+      },
+    );
+  }
+}
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:nil/nil.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/utils/main_stream.dart';
@ -142,10 +141,10 @@ class _BangumiPageState extends State<BangumiPage>
                                      ),
                              );
                            } else {
-                              return nil;
+                              return const SizedBox();
                            }
                          } else {
-                            return nil;
+                            return const SizedBox();
                          }
                        },
                      ),
@ -216,7 +215,7 @@ class _BangumiPageState extends State<BangumiPage>
        (BuildContext context, int index) {
          return bangumiList!.isNotEmpty
              ? BangumiCardV(bangumiItem: bangumiList[index])
-              : nil;
+              : const SizedBox();
        },
        childCount: bangumiList!.isNotEmpty ? bangumiList!.length : 10,
      ),
--- a/lib/plugin/pl_player/widgets/bottom_control.dart
+++ b/lib/plugin/pl_player/widgets/bottom_control.dart
@ -1,7 +1,6 @@
 import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:nil/nil.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/feed_back.dart';

@ -36,7 +35,7 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
              final int max = _.durationSeconds.value;
              final int buffer = _.bufferedSeconds.value;
              if (value > max || max <= 0) {
-                return nil;
+                return const SizedBox();
              }
              return Padding(
                padding: const EdgeInsets.only(left: 7, right: 7, bottom: 6),
--- a/pubspec.lock
+++ b/pubspec.lock
@ -17,14 +17,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "6.2.0"
-  animations:
-    dependency: "direct main"
-    description:
-      name: animations
-      sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.11"
  appscheme:
    dependency: "direct main"
    description:
@ -101,10 +93,10 @@ packages:
    dependency: "direct main"
    description:
      name: audio_video_progress_bar
-      sha256: ccc7d7b83d2a16c52d4a7fb332faabd1baa053fb0e4c16815aefd3945ab33b81
+      sha256: "552b1f73c56c4c88407999e0a8507176f60c56de3e6d63bc20a0eab48467d4c9"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
  auto_orientation:
    dependency: "direct main"
    description:
@ -213,10 +205,10 @@ packages:
    dependency: "direct main"
    description:
      name: catcher_2
-      sha256: "9cf33d2befd10058374e5fc6177577fdd938d73d9c06810de81cf91311a7ce98"
+      sha256: "2c2c6f8cf8c817730cd1dbb010d55292396930e7a3d42c04c3039e3fd411a2f8"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.2.3"
+    version: "1.2.6"
  characters:
    dependency: transitive
    description:
@ -269,10 +261,10 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9
+      sha256: db7a4e143dc72cc3cb2044ef9b052a7ebfe729513e6a82943bc3526f784365b8
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.0.1"
+    version: "6.0.3"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
@ -301,10 +293,10 @@ packages:
    dependency: transitive
    description:
      name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.3.3+8"
+    version: "0.3.4+1"
  crypto:
    dependency: "direct main"
    description:
@ -333,10 +325,10 @@ packages:
    dependency: "direct main"
    description:
      name: custom_sliding_segmented_control
-      sha256: "05b73fa48d57218bfdf806bad68a859812b216cd81fe81c6cbefde89f39eb257"
+      sha256: "53c3e931c3ae1f696085d1ec70ac8e934da836595a9b7d9b88fdd0fcbf2a5574"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.8.1"
+    version: "1.8.3"
  dart_style:
    dependency: transitive
    description:
@ -461,10 +453,10 @@ packages:
    dependency: transitive
    description:
      name: extended_image_library
-      sha256: "9b55fc5ebc65fad984de66b8f177a1bef2a84d79203c9c213f75ff83c2c29edd"
+      sha256: c9caee8fe9b6547bd41c960c4f2d1ef8e34321804de6a1777f1d614a24247ad6
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.0.1"
+    version: "4.0.4"
  extended_list:
    dependency: transitive
    description:
@ -621,10 +613,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_volume_controller
-      sha256: "0f10cc759499cb6c3e152a8f6ff8e5ce385b99db7e1f586d1a29d8e6c11f4082"
+      sha256: fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
  flutter_web_plugins:
    dependency: transitive
    description: flutter
@ -722,10 +714,10 @@ packages:
    dependency: transitive
    description:
      name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
  http2:
    dependency: transitive
    description:
@ -770,10 +762,10 @@ packages:
    dependency: transitive
    description:
      name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
  io:
    dependency: transitive
    description:
@ -798,6 +790,30 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "4.8.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.1"
  lints:
    dependency: transitive
    description:
@ -834,10 +850,10 @@ packages:
    dependency: "direct main"
    description:
      name: logger
-      sha256: "6bbb9d6f7056729537a4309bda2e74e18e5d9f14302489cc1e93f33b3fe32cac"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.2+1"
+    version: "2.3.0"
  logging:
    dependency: transitive
    description:
@ -850,26 +866,26 @@ packages:
    dependency: transitive
    description:
      name: mailer
-      sha256: "57f6dd1496699999a7bfd0aa6be0645384f477f4823e16d4321c40a434346382"
+      sha256: d25d89555c1031abacb448f07b801d7c01b4c21d4558e944b12b64394c84a3cb
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.0.1"
+    version: "6.1.0"
  matcher:
    dependency: transitive
    description:
      name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
  media_kit:
    dependency: "direct main"
    description:
@ -949,10 +965,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.10.0"
+    version: "1.12.0"
  mime:
    dependency: transitive
    description:
@ -961,14 +977,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "1.0.4"
-  nil:
-    dependency: "direct main"
-    description:
-      name: nil
-      sha256: ef05770c48942876d843bf6a4822d35e5da0ff893a61f1d5ad96d15c4a659136
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.1"
  nm:
    dependency: transitive
    description:
@ -1022,10 +1030,10 @@ packages:
    dependency: "direct main"
    description:
      name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
  path_parsing:
    dependency: transitive
    description:
@ -1435,10 +1443,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
  timing:
    dependency: transitive
    description:
@ -1467,10 +1475,10 @@ packages:
    dependency: "direct main"
    description:
      name: universal_platform
-      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
+      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.0.0+1"
+    version: "1.1.0"
  uri_parser:
    dependency: transitive
    description:
@ -1483,10 +1491,10 @@ packages:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.2.2"
+    version: "6.2.6"
  url_launcher_android:
    dependency: transitive
    description:
@ -1499,10 +1507,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.2.1"
+    version: "6.3.0"
  url_launcher_linux:
    dependency: transitive
    description:
@ -1531,10 +1539,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9"
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.2.2"
+    version: "2.3.1"
  url_launcher_windows:
    dependency: transitive
    description:
@ -1591,6 +1599,14 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "0.4.0+2"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "14.2.1"
  volume_controller:
    dependency: transitive
    description:
@ -1603,18 +1619,18 @@ packages:
    dependency: "direct main"
    description:
      name: wakelock_plus
-      sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d
+      sha256: "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.4"
+    version: "1.2.1"
  wakelock_plus_platform_interface:
    dependency: transitive
    description:
      name: wakelock_plus_platform_interface
-      sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385"
+      sha256: "582f2f7aecc7376332d961a0dd1efa9378ce117657e0ade55d9ff72699a55e82"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
  watcher:
    dependency: transitive
    description:
@ -1635,10 +1651,10 @@ packages:
    dependency: transitive
    description:
      name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.3.0"
+    version: "0.5.1"
  web_socket_channel:
    dependency: transitive
    description:
@ -1659,34 +1675,34 @@ packages:
    dependency: "direct main"
    description:
      name: webview_flutter
-      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
+      sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.5.0"
+    version: "4.8.0"
  webview_flutter_android:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: e313dcdf45d4c95bcb8960351ef2389b7f0687b90bc92483f7f7983ae5758456
+      sha256: f42447ca49523f11d8f70abea55ea211b3cafe172dd7a0e7ac007bb35dd356dc
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.13.0"
+    version: "3.16.4"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
      name: webview_flutter_platform_interface
-      sha256: "68e86162aa8fc646ae859e1585995c096c95fc2476881fa0c4a8d10f56013a5a"
+      sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.8.0"
+    version: "2.10.0"
  webview_flutter_wkwebview:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
+      sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.10.2"
+    version: "3.13.1"
  win32:
    dependency: transitive
    description:
@ -1728,5 +1744,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -44,7 +44,7 @@ dependencies:
  dio: ^5.4.1
  cookie_jar: ^4.0.8
  dio_cookie_manager: ^3.1.1
-  connectivity_plus: ^6.0.1
+  connectivity_plus: ^6.0.3
  dio_http2_adapter: ^2.3.1+1

  # 图片
@ -66,7 +66,7 @@ dependencies:
  # cookie 管理
  webview_cookie_manager: ^2.0.6
  # 浏览器
-  webview_flutter: ^4.5.0
+  webview_flutter: ^4.8.0
  # 解决sliver滑动不同步
  extended_nested_scroll_view: ^6.2.1
  # 上拉加载
@ -79,7 +79,7 @@ dependencies:
  flutter_smart_dialog: ^4.9.4
  # 下滑关闭
  dismissible_page: ^1.0.2
-  custom_sliding_segmented_control: ^1.7.5
+  custom_sliding_segmented_control: ^1.8.3
  # 加密
  crypto: ^3.0.3
  encrypt: ^5.0.3
@ -94,19 +94,18 @@ dependencies:
  audio_session: ^0.1.18

  # 音量、亮度、屏幕控制
-  flutter_volume_controller: ^1.3.1
+  flutter_volume_controller: ^1.3.2
  screen_brightness: ^0.2.2+1
-  wakelock_plus: ^1.1.1
-  universal_platform: ^1.0.0+1
+  wakelock_plus: ^1.1.6
+  universal_platform: ^1.1.0
  # 进度条
-  audio_video_progress_bar: ^2.0.2
+  audio_video_progress_bar: ^2.0.3
  auto_orientation: ^2.3.1
  protobuf: ^3.0.0
-  animations: ^2.0.11

  # 获取appx信息
-  package_info_plus: ^4.1.0
-  url_launcher: ^6.1.14
+  package_info_plus: ^4.2.0
+  url_launcher: ^6.2.6
  flutter_svg: ^2.0.10+1
  # 防抖节流
  easy_debounce: ^2.0.3
@ -136,10 +135,9 @@ dependencies:
  gt3_flutter_plugin: ^0.0.8
  uuid: ^3.0.7
  scrollable_positioned_list: ^0.3.8
-  nil: ^1.1.1
-  catcher_2: ^1.2.3
-  logger: ^2.0.2+1
-  path: 1.8.3
+  catcher_2: ^1.2.6
+  logger: ^2.3.0
+  path: ^1.9.0
  # 电池优化
  disable_battery_optimization: ^1.1.1
  # 展开/收起
@ -166,15 +164,15 @@ dev_dependencies:
  build_runner: ^2.4.8

 dependency_overrides:
-  media_kit: 
+  media_kit:
    git:
      url: https://github.com/media-kit/media-kit
      path: media_kit
-  media_kit_video: 
+  media_kit_video:
    git:
      url: https://github.com/media-kit/media-kit
      path: media_kit_video
-  media_kit_libs_video: 
+  media_kit_libs_video:
    git:
      url: https://github.com/media-kit/media-kit
      path: libs/universal/media_kit_libs_video