Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

feat(player): add network aware low memory mode with manual overrides

Predidit22f9ee13a93d
diff --git a/lib/app_widget.dart b/lib/app_widget.dart
index 3ff3c390..288d7f04 100644
--- a/lib/app_widget.dart
+++ b/lib/app_widget.dart
@@ -7,6 +7,7 @@ import 'package:flutter_displaymode/flutter_displaymode.dart';
import 'package:kazumi/services/storage/storage.dart';
import 'package:tray_manager/tray_manager.dart';
import 'package:kazumi/services/logging/logger.dart';
+import 'package:kazumi/services/network/metered_network_service.dart';
import 'package:window_manager/window_manager.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/dialog/exit_confirmation_dialog.dart';
@@ -235,6 +236,7 @@ class _AppWidgetState extends State<AppWidget>
} else if (state == AppLifecycleState.resumed) {
KazumiLogger()
.i("AppLifecycleState.resumed: Application moved to foreground");
+ await MeteredNetworkService.refresh();
} else if (state == AppLifecycleState.inactive) {
KazumiLogger().i("AppLifecycleState.inactive: Application is inactive");
}
diff --git a/lib/main.dart b/lib/main.dart
index e8c489a7..02a1a135 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -91,7 +91,7 @@ void main() async {
if (Platform.isWindows) {
SystemProxyService.init();
}
- MeteredNetworkService.init();
+ await MeteredNetworkService.refresh();
ProxyManager.applyProxy();
runApp(
ModularApp(
diff --git a/lib/pages/player/controller/player_playback_controller.dart b/lib/pages/player/controller/player_playback_controller.dart
index 60f119bf..d6ba9cc4 100644
--- a/lib/pages/player/controller/player_playback_controller.dart
+++ b/lib/pages/player/controller/player_playback_controller.dart
@@ -468,8 +468,8 @@ abstract class _PlayerPlaybackController with Store {
return await _discardIfNotCurrent(candidate);
}
- if (cachePolicy.networkForced) {
- KazumiDialog.showToast(message: '正在使用移动数据,已临时启用低内存模式以减少缓存');
+ if (cachePolicy.networkAutomatic) {
+ KazumiDialog.showToast(message: '移动数据下已自动开启低内存模式,可在播放设置中改为始终关闭');
}
return player;
diff --git a/lib/pages/settings/low_memory_mode_settings.dart b/lib/pages/settings/low_memory_mode_settings.dart
new file mode 100644
index 00000000..c49c4b7f
--- /dev/null
+++ b/lib/pages/settings/low_memory_mode_settings.dart
@@ -0,0 +1,183 @@
+import 'package:flutter/material.dart';
+import 'package:kazumi/bean/dialog/dialog_helper.dart';
+import 'package:kazumi/bean/settings/settings_list.dart';
+import 'package:kazumi/bean/widget/split_list_row.dart';
+import 'package:kazumi/services/network/metered_network_service.dart';
+import 'package:kazumi/services/player/low_memory_mode.dart';
+
+class LowMemoryModeSettingsTile extends StatelessWidget {
+ const LowMemoryModeSettingsTile({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return _ModeBuilder(builder: (context, mode, isMetered) {
+ return SettingsTile(
+ leading: Icons.data_saver_on_rounded,
+ title: const Text('低内存模式'),
+ description: Text(mode.statusDescription(isMetered)),
+ value: Text(mode.label),
+ trailing: const Icon(Icons.chevron_right_rounded),
+ onPressed: (_) => KazumiDialog.show<void>(
+ builder: (_) => const _LowMemoryModeDialog(),
+ ),
+ );
+ });
+ }
+}
+
+class _LowMemoryModeDialog extends StatefulWidget {
+ const _LowMemoryModeDialog();
+
+ @override
+ State<_LowMemoryModeDialog> createState() => _LowMemoryModeDialogState();
+}
+
+class _LowMemoryModeDialogState extends State<_LowMemoryModeDialog> {
+ bool _saving = false;
+
+ Future<void> _selectMode(LowMemoryMode? mode) async {
+ if (mode == null || _saving) return;
+ setState(() => _saving = true);
+ try {
+ await mode.save();
+ if (!mounted) return;
+ KazumiDialog.dismiss(context: context);
+ } catch (_) {
+ if (!mounted) return;
+ setState(() => _saving = false);
+ KazumiDialog.showToast(context: context, message: '设置保存失败,请重试');
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final colors = Theme.of(context).colorScheme;
+ final textTheme = Theme.of(context).textTheme;
+ return AlertDialog(
+ title: const Text('低内存模式'),
+ scrollable: true,
+ content: SizedBox(
+ width: 440,
+ child: _ModeBuilder(builder: (context, mode, isMetered) {
+ final enabled = mode.isEnabled(isMetered: isMetered);
+ final foreground =
+ enabled ? colors.onSecondaryContainer : colors.onSurfaceVariant;
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ Semantics(
+ liveRegion: true,
+ child: Container(
+ padding: const EdgeInsets.all(16),
+ decoration: BoxDecoration(
+ color: enabled
+ ? colors.secondaryContainer
+ : colors.surfaceContainerHighest,
+ borderRadius: BorderRadius.circular(16),
+ ),
+ child: Row(
+ children: [
+ Icon(
+ enabled
+ ? Icons.data_saver_on_rounded
+ : Icons.data_usage_rounded,
+ color: foreground,
+ ),
+ const SizedBox(width: 12),
+ Expanded(
+ child: Text(
+ mode.statusDescription(isMetered),
+ style: textTheme.bodyMedium?.copyWith(
+ color: foreground,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ const SizedBox(height: 16),
+ RadioGroup<LowMemoryMode>(
+ groupValue: mode,
+ onChanged: _selectMode,
+ child: SplitListGroup(
+ children: [
+ for (final option in LowMemoryMode.values)
+ SettingsTile<LowMemoryMode>.radioTile(
+ title: Text(option == LowMemoryMode.auto
+ ? '${option.label}(默认)'
+ : option.label),
+ description: Text(option.description),
+ radioValue: option,
+ enabled: !_saving,
+ ),
+ ],
+ ),
+ ),
+ const SizedBox(height: 16),
+ Text(
+ '减少缓存可降低内存占用和额外流量,网络不稳定时可能更容易缓冲。'
+ '\n选择后立即生效并记住选择;跟随网络仅影响在线播放。',
+ style: textTheme.bodySmall
+ ?.copyWith(color: colors.onSurfaceVariant),
+ ),
+ ],
+ );
+ }),
+ ),
+ actions: [
+ TextButton(
+ onPressed: () => KazumiDialog.dismiss(context: context),
+ child: const Text('取消'),
+ ),
+ ],
+ );
+ }
+}
+
+class _ModeBuilder extends StatefulWidget {
+ const _ModeBuilder({required this.builder});
+
+ final Widget Function(BuildContext, LowMemoryMode, bool) builder;
+
+ @override
+ State<_ModeBuilder> createState() => _ModeBuilderState();
+}
+
+extension _ModePresentation on LowMemoryMode {
+ String get label => switch (this) {
+ LowMemoryMode.auto => '跟随网络',
+ LowMemoryMode.always => '始终开启',
+ LowMemoryMode.never => '始终关闭',
+ };
+
+ String get description => switch (this) {
+ LowMemoryMode.auto => '移动数据自动开启,WLAN / 有线网络自动关闭',
+ LowMemoryMode.always => '所有网络均减少缓存,降低内存占用',
+ LowMemoryMode.never => '使用完整缓存,移动数据下也不自动开启',
+ };
+
+ String statusDescription(bool isMetered) => switch (this) {
+ LowMemoryMode.auto =>
+ isMetered ? '已自动开启 · 移动数据下减少缓存' : '已自动关闭 · 非移动网络使用完整缓存',
+ LowMemoryMode.always => '已手动开启 · 所有网络均减少缓存',
+ LowMemoryMode.never =>
+ isMetered ? '已手动关闭 · 移动数据使用完整缓存' : '已手动关闭 · 使用完整缓存',
+ };
+}
+
+class _ModeBuilderState extends State<_ModeBuilder> {
+ late final Stream<void> _settingsChanges = LowMemoryMode.watch();
+
+ @override
+ Widget build(BuildContext context) {
+ return StreamBuilder<void>(
+ stream: _settingsChanges,
+ builder: (context, _) => ValueListenableBuilder<bool>(
+ valueListenable: MeteredNetworkService.listenable,
+ builder: (context, isMetered, _) =>
+ widget.builder(context, LowMemoryMode.current, isMetered),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/settings/player_settings.dart b/lib/pages/settings/player_settings.dart
index 5cac42c8..e6ccac55 100644
--- a/lib/pages/settings/player_settings.dart
+++ b/lib/pages/settings/player_settings.dart
@@ -5,7 +5,7 @@ import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/settings/settings_detail_scaffold.dart';
import 'package:kazumi/pages/player/controller/player_aspect_ratio.dart';
-import 'package:kazumi/services/network/metered_network_service.dart';
+import 'package:kazumi/pages/settings/low_memory_mode_settings.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/services/storage/storage.dart';
import 'package:kazumi/services/player/pip_utils.dart';
@@ -30,7 +30,6 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
late bool hAenable;
late bool androidEnableOpenSLES;
late bool androidAutoEnterPIP;
- late bool lowMemoryMode;
late bool playResume;
late bool showPlayerError;
late bool privateMode;
@@ -51,18 +50,6 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
void initState() {
super.initState();
_loadSettingsFromStorage();
- MeteredNetworkService.listenable.addListener(_onMeteredNetworkChanged);
- }
-
- @override
- void dispose() {
- MeteredNetworkService.listenable.removeListener(_onMeteredNetworkChanged);
- super.dispose();
- }
-
- void _onMeteredNetworkChanged() {
- if (!mounted) return;
- setState(() {});
}
void _loadSettingsFromStorage() {
@@ -78,7 +65,6 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
GStorage.getSetting<bool>(SettingsKeys.androidEnableOpenSLES);
androidAutoEnterPIP =
GStorage.getSetting<bool>(SettingsKeys.androidAutoEnterPIP);
- lowMemoryMode = GStorage.getSetting<bool>(SettingsKeys.lowMemoryMode);
playResume = GStorage.getSetting<bool>(SettingsKeys.playResume);
privateMode = GStorage.getSetting<bool>(SettingsKeys.privateMode);
showPlayerError = GStorage.getSetting<bool>(SettingsKeys.showPlayerError);
@@ -292,22 +278,7 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
description: Text('选择视频输出方式'),
),
],
- SettingsTile.switchTile(
- leading: Icons.data_saver_on_rounded,
- enabled: !MeteredNetworkService.isMetered,
- onToggle: (value) async {
- lowMemoryMode = value ?? !lowMemoryMode;
- await GStorage.putSetting<bool>(
- SettingsKeys.lowMemoryMode, lowMemoryMode);
- setState(() {});
- },
- title: Text('低内存模式'),
- description: Text(MeteredNetworkService.isMetered
- ? '移动网络下已自动启用'
- : '禁用高级缓存以减少内存占用'),
- // Effective state, not the stored one, which stays untouched.
- initialValue: lowMemoryMode || MeteredNetworkService.isMetered,
- ),
+ const LowMemoryModeSettingsTile(),
if (Platform.isAndroid) ...[
SettingsTile.switchTile(
leading: Icons.graphic_eq_rounded,
diff --git a/lib/services/network/metered_network_service.dart b/lib/services/network/metered_network_service.dart
index a647a6f3..a6246251 100644
--- a/lib/services/network/metered_network_service.dart
+++ b/lib/services/network/metered_network_service.dart
@@ -1,34 +1,52 @@
import 'dart:async';
-import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/foundation.dart';
import 'package:kazumi/services/logging/logger.dart';
-/// Tracks whether the active link is cellular data rather than WLAN / LAN.
class MeteredNetworkService {
MeteredNetworkService._();
static final ValueNotifier<bool> _metered = ValueNotifier<bool>(false);
static StreamSubscription<List<ConnectivityResult>>? _subscription;
+ static int _revision = 0;
- static bool get _supported => Platform.isAndroid || Platform.isIOS;
+ static bool get _supported =>
+ defaultTargetPlatform == TargetPlatform.android ||
+ defaultTargetPlatform == TargetPlatform.iOS;
static bool get isMetered => _metered.value;
static ValueListenable<bool> get listenable => _metered;
- static void init() {
- if (!_supported || _subscription != null) {
- return;
+ static Future<void> refresh() async {
+ if (!_supported) return;
+ final revision = ++_revision;
+ try {
+ // Reset event deduplication after missed background network changes.
+ final previous = _subscription;
+ _subscription = null;
+ await previous?.cancel();
+ if (revision != _revision) return;
+ _subscription = Connectivity().onConnectivityChanged.listen(
+ (results) {
+ _revision++;
+ _apply(results);
+ },
+ onError: (Object error) {
+ KazumiLogger().w('Network: 网络类型监听中断 $error');
+ },
+ );
+ final results = await Connectivity()
+ .checkConnectivity()
+ .timeout(const Duration(seconds: 3));
+ // Discard queries superseded by a refresh or a network event.
+ if (revision == _revision) {
+ _apply(results);
+ }
+ } catch (error) {
+ KazumiLogger().w('Network: 读取网络类型失败,保留上次状态 $error');
}
- // The platform emits the current state on subscription, so no initial read.
- _subscription = Connectivity().onConnectivityChanged.listen(
- _apply,
- onError: (Object error) {
- KazumiLogger().w('Network: 网络类型监听中断 $error');
- },
- );
}
static void _apply(List<ConnectivityResult> results) {
@@ -41,9 +59,7 @@ class MeteredNetworkService {
_metered.value = metered;
}
- /// An unmetered transport wins over `mobile`, which Android reports alongside
- /// `wifi` during a handover. Null means unresolvable (`none`, or a bare
- /// `vpn`); the last known value stands rather than releasing the protection.
+ // WLAN wins during handovers; unknown transports retain the last known state.
static bool? _isMetered(List<ConnectivityResult> results) {
if (results.contains(ConnectivityResult.wifi) ||
results.contains(ConnectivityResult.ethernet)) {
diff --git a/lib/services/player/low_memory_mode.dart b/lib/services/player/low_memory_mode.dart
new file mode 100644
index 00000000..de90e17c
--- /dev/null
+++ b/lib/services/player/low_memory_mode.dart
@@ -0,0 +1,36 @@
+import 'package:kazumi/services/storage/storage.dart';
+
+enum LowMemoryMode {
+ auto('auto'),
+ always('always'),
+ never('never');
+
+ const LowMemoryMode(this._storageValue);
+
+ final String _storageValue;
+
+ static LowMemoryMode get current {
+ return switch (GStorage.getSetting(SettingsKeys.lowMemoryPolicy)) {
+ 'always' => always,
+ 'never' => never,
+ null => GStorage.getSetting(SettingsKeys.lowMemoryMode) ? always : auto,
+ _ => auto,
+ };
+ }
+
+ static Stream<void> watch() => GStorage.watchSettings([
+ SettingsKeys.lowMemoryPolicy,
+ SettingsKeys.lowMemoryMode,
+ ]);
+
+ Future<void> save() =>
+ GStorage.putSetting(SettingsKeys.lowMemoryPolicy, _storageValue);
+
+ bool isEnabled({required bool isMetered, bool isLocalPlayback = false}) {
+ return switch (this) {
+ auto => isMetered && !isLocalPlayback,
+ always => true,
+ never => false,
+ };
+ }
+}
diff --git a/lib/services/player/playback_cache_policy.dart b/lib/services/player/playback_cache_policy.dart
index b82f03e0..ac0571fe 100644
--- a/lib/services/player/playback_cache_policy.dart
+++ b/lib/services/player/playback_cache_policy.dart
@@ -2,68 +2,63 @@ import 'dart:async';
import 'package:kazumi/services/logging/logger.dart';
import 'package:kazumi/services/network/metered_network_service.dart';
-import 'package:kazumi/services/storage/storage.dart';
+import 'package:kazumi/services/player/low_memory_mode.dart';
import 'package:kazumi/utils/async_serial_queue.dart';
import 'package:media_kit/media_kit.dart';
-/// Owns the demuxer cache size of the player returned by [currentPlayer].
-///
-/// [PlayerConfiguration] seeds the size so a failed write degrades to the right
-/// value instead of the media_kit default; [apply] is authoritative.
class PlaybackCachePolicy {
PlaybackCachePolicy({
- required this.isLocalPlayback,
- required this.currentPlayer,
- });
+ required bool Function() isLocalPlayback,
+ required Player? Function() currentPlayer,
+ }) : _isLocalPlayback = isLocalPlayback,
+ _currentPlayer = currentPlayer;
static const int _lowMemoryBufferSize = 2 * 1024 * 1024;
static const int _defaultBufferSize = 1500 * 1024 * 1024;
- final bool Function() isLocalPlayback;
- final Player? Function() currentPlayer;
+ final bool Function() _isLocalPlayback;
+ final Player? Function() _currentPlayer;
final AsyncSerialQueue _writes = AsyncSerialQueue();
- bool _watching = false;
+ StreamSubscription<void>? _settingsSubscription;
- bool get _userEnabled =>
- GStorage.getSetting<bool>(SettingsKeys.lowMemoryMode);
+ bool get networkAutomatic =>
+ LowMemoryMode.current == LowMemoryMode.auto &&
+ !_isLocalPlayback() &&
+ MeteredNetworkService.isMetered;
- /// Temporary override; local playback is exempt because it costs no data.
- bool get networkForced =>
- !_userEnabled && !isLocalPlayback() && MeteredNetworkService.isMetered;
-
- int get bufferSize =>
- _userEnabled || networkForced ? _lowMemoryBufferSize : _defaultBufferSize;
+ int get bufferSize => LowMemoryMode.current.isEnabled(
+ isMetered: MeteredNetworkService.isMetered,
+ isLocalPlayback: _isLocalPlayback(),
+ )
+ ? _lowMemoryBufferSize
+ : _defaultBufferSize;
void startWatching() {
- if (_watching) {
+ if (_settingsSubscription != null) {
return;
}
- _watching = true;
- MeteredNetworkService.listenable.addListener(_onNetworkChanged);
+ _settingsSubscription = LowMemoryMode.watch().listen((_) => _onChanged());
+ MeteredNetworkService.listenable.addListener(_onChanged);
}
void stopWatching() {
- if (!_watching) {
- return;
- }
- _watching = false;
- MeteredNetworkService.listenable.removeListener(_onNetworkChanged);
+ MeteredNetworkService.listenable.removeListener(_onChanged);
+ unawaited(_settingsSubscription?.cancel());
+ _settingsSubscription = null;
}
- /// Waits for initialization so the seed cannot land after this write. That
- /// wait stays outside the queue, where an unresolved one would stall every
- /// later write.
Future<void> apply() async {
- final player = currentPlayer();
+ final player = _currentPlayer();
if (player == null) {
return;
}
try {
final pp = player.platform as NativePlayer;
+ // A stale player's initialization must not block its replacement's writes.
await pp.waitForPlayerInitialization;
await _writes.run(() async {
- if (!identical(currentPlayer(), player)) {
+ if (!identical(_currentPlayer(), player)) {
return;
}
final size = bufferSize.toString();
@@ -78,7 +73,7 @@ class PlaybackCachePolicy {
}
}
- void _onNetworkChanged() {
+ void _onChanged() {
unawaited(apply());
}
}
diff --git a/lib/services/storage/settings_keys.dart b/lib/services/storage/settings_keys.dart
index 6cd69a6b..68d7e2eb 100644
--- a/lib/services/storage/settings_keys.dart
+++ b/lib/services/storage/settings_keys.dart
@@ -308,6 +308,12 @@ class SettingsKeys {
false,
group: SettingGroup.player,
);
+ // Null preserves the legacy lowMemoryMode choice until a policy is selected.
+ static const lowMemoryPolicy = SettingKey<String?>(
+ 'lowMemoryPolicy',
+ null,
+ group: SettingGroup.player,
+ );
static const showWindowButton = SettingKey<bool>(
_SettingBoxKey.showWindowButton,
false,
@@ -576,6 +582,7 @@ class SettingsKeys {
webDavUsername,
webDavPassword,
lowMemoryMode,
+ lowMemoryPolicy,
showWindowButton,
useDynamicColor,
exitBehavior,
diff --git a/lib/services/storage/storage.dart b/lib/services/storage/storage.dart
index 98b2449e..98d5ef2a 100644
--- a/lib/services/storage/storage.dart
+++ b/lib/services/storage/storage.dart
@@ -341,6 +341,11 @@ class GStorage {
await _setting.put(key.name, value);
}
+ static Stream<void> watchSettings(Iterable<SettingKey<Object?>> keys) {
+ final names = keys.map((key) => key.name).toSet();
+ return _setting.watch().where((event) => names.contains(event.key)).map((_) {});
+ }
+
static List<String> getStringListSettingByName(
String key, {
List<String> defaultValue = const [],